添加资产数据

arch-base/pom.xml

@@ -175,6 +175,10 @@
             <artifactId>tika-parser-pdf-module</artifactId>
             <artifactId>tika-parser-pdf-module</artifactId>
             <scope>compile</scope>
             <scope>compile</scope>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.nasdanika.core</groupId>
+            <artifactId>mxgraph</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>
\ No newline at end of file

arch-base/src/main/java/org/arch/config/LongListFormatSerializer.java

+package org.arch.config;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LongListFormatSerializer extends JsonSerializer<List<Long>> {
+
+
+    @Override
+    public void serialize(List<Long> value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+//        String text = "";
+        List<String> strList_v = new ArrayList<>();
+        //是否为空
+        if (!CollectionUtils.isEmpty(value)) {
+            try {
+                List<String> strList = new ArrayList<>(value.size());
+                for (Long aLong : value) {
+                    strList.add(String.valueOf(aLong));
+                }
+                //格式化是否为空
+                if (!CollectionUtils.isEmpty(strList)) {
+                    jsonGenerator.writeObject(strList);
+                    return;
+                }
+            } catch (Exception ignored) {
+
+            }
+        }
+//        jsonGenerator.writeString(text);
+        jsonGenerator.writeObject(strList_v);
+
+    }
+}
+

arch-base/src/main/java/org/arch/enums/ArchiAbilityInventoryEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 总体架构资产维护-企业中台服务清单枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum ArchiAbilityInventoryEnum {
+
+    //====================================总体架构资产维护-企业中台服务清单-中台服务清单枚举====================================
+
+    SERVICE_INV_FREQ(1, "服务调用频率", ""),
+
+    SERVICE_INV_NUM(2, "服务调用方数量", ""),
+
+    OPR_ENTITY_NUM(3, "操作实体数量", ""),
+
+    SUPPORT_TEC_MODNUM(4, "支撑技术组件数量", ""),
+
+    SUPPPORT_BUS_ACTNUM(5, "支撑的业务活动数量", ""),
+
+    REL_MID_SERVICE_NUM(6, "关联的中台服务数量", ""),
+
+
+
+    //====================================总体架构资产维护-企业中台服务清单-业务信息枚举类====================================
+
+    REL_BUS_NUM(7, "关联的业务对象数量", ""),
+
+    REL_APP_NUM(8, "关联的应用服务数量", "");
+
+
+    private final Integer code;
+
+    private final String name;
+
+    private final String type;
+}

arch-base/src/main/java/org/arch/enums/ArchiAssetEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 架构资产类型枚举
+ *
+ * @author admin
+ * @date 2024/01/12
+ */
+@Getter
+@AllArgsConstructor
+public enum ArchiAssetEnum {
+
+    BUSI("archi_asset_busi", 1, "业务架构"),
+    APP("archi_asset_app", 2, "应用架构"),
+    DATA("archi_asset_data", 3, "数据架构"),
+    TECH("archi_asset_tech", 4, "技术架构"),
+    SAFE("archi_asset_safe", 5, "安全架构");
+
+    private final String code;
+
+    private final Integer id;
+
+    private final String name;
+
+    /**
+     * 根据id获取架构资产类型
+     */
+    public static ArchiAssetEnum getEnumById(Integer id) {
+        for (ArchiAssetEnum value : ArchiAssetEnum.values()) {
+            if (value.getId().equals(id)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

arch-base/src/main/java/org/arch/enums/ArchiAssetType.java

+package org.arch.enums;
+
+/**
+ * 架构资产类型（3.新增、2.完善、1.遵从）
+ *
+ * @author xh13k
+ * @date 2024/05/07
+ */
+public enum ArchiAssetType {
+
+    /**
+     * 新增
+     */
+    ADD(3, "新增"),
+
+    /**
+     * 完善
+     */
+    IMPROVE(2, "完善"),
+
+    /**
+     * 遵从
+     */
+    FOLLOW(1, "遵从");
+
+    private final int code;
+
+    private final String desc;
+
+    ArchiAssetType(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static ArchiAssetType getByCode(int code) {
+        for (ArchiAssetType value : values()) {
+            if (value.code == code) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

arch-base/src/main/java/org/arch/enums/ArchiAssetTypeEnum.java

+package org.arch.enums;
+
+import lombok.Getter;
+
+/**
+ * 3.新增、2.完善、1.遵从
+ *
+ * @author xh13k
+ * @date 2024/04/28
+ */
+@Getter
+public enum ArchiAssetTypeEnum {
+
+    /**
+     * 新增
+     */
+    ADD(3, "新增"),
+    /**
+     * 完善
+     */
+    IMPROVE(2, "完善"),
+    /**
+     * 遵从
+     */
+    COMPLY(1, "遵从");
+
+    private final Integer code;
+    private final String desc;
+
+    ArchiAssetTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

arch-base/src/main/java/org/arch/enums/ArchiBigClassEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 架构大类枚举
+ *
+ * <p>
+ * 1：总体架构；2：系统架构 3：概设架构 4：其他架构
+ * </>
+ *
+ * @author admin
+ * @date 2024/01/12
+ */
+@Getter
+@AllArgsConstructor
+public enum ArchiBigClassEnum {
+
+    TOTAL(1, "总体架构"),
+    SYSTEM(2, "系统架构"),
+    CONCEPT(3, "概设架构"),
+    OTHER(4, "其他架构");
+
+    private final Integer id;
+
+    private final String name;
+}

arch-base/src/main/java/org/arch/enums/ArchiPrjReviewEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 系统架构管用要求评审意见枚举
+ * <p>
+ * 致性评审
+ * 架构遵从
+ * 关键技术深度评审
+ * 功能深度评审
+ * 数据深度评审
+ * <p>
+ * 安全架构遵从
+ * 部署架构审查
+ * 技术架构遵从
+ * 应用架构遵从
+ * 物理数据架构遵从
+ * <p>
+ * 运安符合性审查
+ * 功能满足审查
+ * 运行可靠性审查
+ * 系统实用性审查
+ * 系统安全性审查
+ * 资源复用性审查
+ */
+@Getter
+@AllArgsConstructor
+public enum ArchiPrjReviewEnum {
+
+    //====================================评审情况（概要设计）====================================
+
+    CONFORMANCE_REVIEW("conformance_review", "一致性评审", ""),
+
+    ARCHITECTURE_CONFORMANCE("architecture_conformance", "架构遵从", ""),
+
+    KEY_TECHNOLOGY_REVIEW("key_technology_review", "关键技术深度评审", ""),
+
+    FUNCTIONAL_DEPTH_REVIEW("functional_depth_review", "功能深度评审", ""),
+
+    DATA_DEPTH_REVIEW("data_depth_review", "数据深度评审", ""),
+
+    //====================================获取批注所需要的====================================
+    FEASIBILITY_STUDY_REPORT("feasibility_study_report", "可行性研究报告", "可行性研究报告"),
+
+    REQUIREMENT_SPECIFICATION("requirement_specification", "需求规格说明书", "需求规格说明书"),
+
+    ARCHI_DESIGN_SPECIFICATION("archi_design_specification", "概要设计说明书", "概要设计说明书"),
+
+    TECHNICAL_SPECIFICATION_BOOK("technical_specification_book", "技术规范书", "技术规范书"),
+
+    SAFETY_PROTECTION_SCHEME("safety_protection_scheme", "安全防护方案", "安全防护方案"),
+
+
+    //====================================概设架构遵从检查====================================
+
+    SECURITY_ARCHITECTURE_CONFORMANCE("security_architecture_conformance", "安全架构遵从", "安全防护方案"),
+
+    DEPLOYMENT_ARCHITECTURE_REVIEW("deployment_architecture_review", "部署架构审查", ""),
+
+    TECHNICAL_ARCHITECTURE_CONFORMANCE("technical_architecture_conformance", "技术架构遵从", "技术架构设计方案"),
+
+    APPLICATION_ARCHITECTURE_CONFORMANCE("application_architecture_conformance", "应用架构遵从", "应用架构遵从"),
+
+    PHYSICAL_DATA_ARCHITECTURE_CONFORMANCE("physical_data_architecture_conformance", "物理数据架构遵从", ""),
+
+    //====================================概设架构政策审查====================================
+
+    OPERATIONAL_SAFETY_COMPLIANCE_REVIEW("operational_safety_compliance_review", "运安符合性审查", "概要设计说明书"),
+
+    FUNCTIONAL_SATISFACTION_REVIEW("functional_satisfaction_review", "功能满足审查", "概要设计说明书"),
+
+    OPERATIONAL_RELIABILITY_REVIEW("operational_reliability_review", "运行可靠性审查", "概要设计说明书"),
+
+    SYSTEM_PRACTICALITY_REVIEW("system_practicality_review", "系统实用性审查", "概要设计说明书"),
+
+    SYSTEM_SECURITY_REVIEW("system_security_review", "系统安全性审查", "概要设计说明书"),
+
+    RESOURCE_REUSABILITY_REVIEW("resource_reusability_review", "资源复用性审查", "概要设计说明书"),
+
+    //====================================概设材料审查====================================
+    REPORT_NORM("report_norm", "报告规范性", "概要设计说明书"),
+
+    FRAMEWORK_OBEY("framework_obey", "架构遵从", "概要设计说明书"),
+
+    TECH_ROUTE("tech_route", "技术路线", "概要设计说明书"),
+
+    FUNCTION_UNLIKE("function_unlike", "功能偏差", "概要设计说明书"),
+
+    APP_DEP("app_dep", "系统部署", "概要设计说明书"),
+
+    APP_INT("app_int", "系统集成", "概要设计说明书"),
+
+    APP_SAFE("app_safe", "系统安全", "概要设计说明书"),
+
+    FUNCTION_S_RISK("function_s_risk", "功能重复风险", "概要设计说明书"),
+
+    DATA_S_INSERT_RISK("data_s_insert_risk", "数据重复录入风险", "概要设计说明书"),
+
+    //====================================概设材料解析====================================
+
+    TECH_ROUTE_CONTENT("tech_route_content", "技术路线状态内容", "技术路线状态内容"),
+    ARCHI_COMP_CONTENT("archi_comp_content", "架构遵从内容", "架构遵从内容"),
+    FUNCTION_LIST_CONTENT("function_list_content", "功能清单内容", "功能清单内容"),
+    DATA_ENTITY_LIST_CONTENT("data_entity_list_content", "数据实体清单内容", "数据实体清单内容"),
+    INTEGRATE_SYS_LIST_CONTENT("integrate_sys_list_content", "集成系统清单内容", "集成系统清单内容");
+
+    private final String code;
+
+    private final String name;
+
+    private final String type;
+}

arch-base/src/main/java/org/arch/enums/ArchiStateEnum.java

+package org.arch.enums;
+
+/**
+ * 状态 0:已停用 1:已发布 2:暂存
+ *
+ * @author xh13k
+ * @date 2024/05/11
+ */
+public enum ArchiStateEnum {
+
+    /**
+     * 已停用
+     */
+    DISABLED(0, "已停用"),
+
+    /**
+     * 已发布
+     */
+    PUBLISHED(1, "已发布"),
+
+    /**
+     * 暂存
+     */
+    TEMPORARY(2, "暂存");
+
+    private final int code;
+    private final String desc;
+
+    ArchiStateEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

arch-base/src/main/java/org/arch/enums/BusinessTypeEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Business 类型枚举
+ *
+ * @author admin
+ * @date 2024/01/12
+ */
+@Getter
+@AllArgsConstructor
+public enum BusinessTypeEnum {
+
+    APP(",aa-", "应用架构"),
+    BUSI("ab-", "业务架构"),
+    DATA("ad-", "数据架构"),
+    SAFE("as-", "安全架构"),
+    TECH("at-", "技术架构");
+
+    private final String code;
+    private final String name;
+}

arch-base/src/main/java/org/arch/enums/DelFlagEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum DelFlagEnum {
+    SHOW(0,"显示"),
+    HIDE(1,"隐藏");
+    private Integer code;
+    private String name;
+}

arch-base/src/main/java/org/arch/enums/DirectoryTypeEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum DirectoryTypeEnum {
+
+    VARTICAL_TABLE("vartical_table", "纵向表格"),
+    HORIZONTAL_TABLE("horizontal_table", "横向表格"),
+    RICH_TEXT("rich_text", "富文本框");
+
+    private String type;
+
+    private String mean;
+}

arch-base/src/main/java/org/arch/enums/EnableEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 是否可用枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum EnableEnum {
+    ENABLE(1,"启用"),
+    UN_ENABLE(0,"禁用"),
+    ;
+    /**
+     * 错误码
+     */
+    private int code;
+
+    /**
+     * 错误信息
+     */
+    private String msg;
+}

arch-base/src/main/java/org/arch/enums/IsDeleteEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 是否可用枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum IsDeleteEnum {
+    DELETE(1,"已删除"),
+    NOT_DELETE(0,"未删除"),
+    ;
+    /**
+     * 错误码
+     */
+    private int code;
+
+    /**
+     * 错误信息
+     */
+    private String msg;
+}

arch-base/src/main/java/org/arch/enums/IsExaApproveEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ *@Description:描述审批状态枚举类
+ *@Author:liu
+ *@Date:2021/7/22 15:31
+ *@Version 1.0
+ */
+@Getter
+@AllArgsConstructor
+
+public enum IsExaApproveEnum {
+    EXA_APPROVE("1","已审批"),
+    NOT_EXA_APPROVE("0","未审批"),
+    ;
+    /**
+     * 状态码
+     */
+    private String code;
+
+    /**
+     * 状态信息
+     */
+    private String msg;
+}

arch-base/src/main/java/org/arch/enums/MenuTypeEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 菜单类型
+ */
+@Getter
+@AllArgsConstructor
+public enum MenuTypeEnum {
+
+    CATALOG(0,"目录"),
+    MENU(1,"菜单"),
+    BUTTON(2,"按钮"),
+    ;
+    /**
+     * 编码
+     */
+    private int code;
+
+    /**
+     * 名称
+     */
+    private String name;
+}

arch-base/src/main/java/org/arch/enums/PrjLinkEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 1.可研
+ * 2.计划
+ * 3.采购
+ * 4.合同
+ * 5.实施
+ * 6.验收
+ * 7.决算
+ * 8.转资
+ *
+ * @author xh13k
+ * @date 2023/05/04
+ */
+@Getter
+@AllArgsConstructor
+public enum PrjLinkEnum {
+
+    PRJ_PRE("1", "可研"),
+    PRJ_BUILD("2", "计划"),
+    PRJ_BUY("3", "采购"),
+    PRJ_CONTRACT("4", "合同"),
+    PRJ_WORK("5", "实施"),
+    PRJ_CHECK("6", "验收"),
+    PRJ_FINAL("7", "决算"),
+    PRJ_TRANS("8", "转资");
+
+    private String code;
+
+    private String name;
+
+    public static String getNameByCode(String code) {
+        for (PrjLinkEnum prjLinkEnum : PrjLinkEnum.values()) {
+            if (prjLinkEnum.getCode().equals(code)) {
+                return prjLinkEnum.getName();
+            }
+        }
+        return null;
+    }
+}

arch-base/src/main/java/org/arch/enums/PrjStateEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 1:项目前期
+ * 2:项目建设
+ * 3:项目验收
+ *
+ * @author xh13k
+ * @date 2023/05/04
+ */
+@Getter
+@AllArgsConstructor
+public enum PrjStateEnum {
+
+    PRJ_PRE("1", "项目前期"),
+    PRJ_BUILD("2", "项目建设"),
+    PRJ_CHECK("3", "项目验收");
+
+    private String code;
+
+    private String name;
+
+    public static String getNameByCode(String code) {
+        for (PrjStateEnum prjStateEnum : PrjStateEnum.values()) {
+            if (prjStateEnum.getCode().equals(code)) {
+                return prjStateEnum.getName();
+            }
+        }
+        return null;
+    }
+
+}

arch-base/src/main/java/org/arch/enums/SexEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户性别
+ */
+@Getter
+@AllArgsConstructor
+public enum SexEnum {
+    UN_KNOW(0,"未知"),
+    MAN(1,"男"),
+    WOMAN(2,"女"),
+    ;
+    /**
+     * 错误码
+     */
+    private int code;
+
+    /**
+     * 错误信息
+     */
+    private String name;
+}

arch-base/src/main/java/org/arch/enums/StatusEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 状态类型字段值的枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum StatusEnum {
+
+    //文档模板状态值
+    TEMPLATE_CREATED("0", "已创建"),
+    TEMPLATE_EDIT("1", "编制中"),
+    TEMPLATE_USED("2", "执行中"),
+    TEMPLATE_UNUSED("2", "已禁用"),
+
+    FSR_BACK("0", "驳回"),
+    FSR_EDIT("1", "编制"),
+    FSR_TRIAL("2", "初审"),
+    FSR_SIGN("3", "会签"),
+    FSR_UPDATE("4", "修正"),
+    FSR_PASS("5", "通过"),
+
+    FSR_TABLE_CONTENT_BEF("1", "原有"),
+    FSR_TABLE_CONTENT_UPD("2", "优化"),
+    FSR_TABLE_CONTENT_NEW("3", "新增")
+    ;
+
+
+    private String status;
+
+    private String mean;
+}

arch-base/src/main/java/org/arch/enums/TypeEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TypeEnum {
+
+    //模板类型
+    TEMPLATE_FSR("可研模板", "0"),
+    TEMPLATE_ADS("概设模板",  "1");
+
+    private String name;
+
+    private String value;
+}

arch-base/src/main/java/org/arch/enums/UserTypeEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserTypeEnum {
+    TEMPORARY_STAFF(0,"临时员工"),
+    REGULAR_EMPLOYEE(1,"正式员工"),
+    ;
+    /**
+     * 编码
+     */
+    private int code;
+
+    /**
+     * 名称
+     */
+    private String name;
+}

arch-base/src/main/java/org/arch/enums/VersionStatusEnum.java

+package org.arch.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 版本状态
+ */
+@Getter
+@AllArgsConstructor
+public enum VersionStatusEnum {
+    CURR_VERSION("1","当前版本"),
+    HISTORY_VERSION("2","历史版本"),
+    ;
+    /**
+     * 错误码
+     */
+    private String code;
+
+    /**
+     * 错误信息
+     */
+    private String name;
+}

arch-base/src/main/java/org/arch/enums/ViewTypeEnum.java

+package org.arch.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ViewTypeEnum {
+    SHOW_TYPE(1,"显示类型"),
+    NORMAL_TYPE(0,"常规类型");
+    private Integer code;
+    private String name;
+}

arch-base/src/main/java/org/arch/exception/BDException.java

+package org.arch.exception;
+
+/**
+ * 自定义异常
+ *
+ */
+public class BDException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
+
+    private String msg;
+    private int code = 500;
+
+    public BDException(String msg) {
+		super(msg);
+		this.msg = msg;
+	}
+
+	public BDException(String msg, Throwable e) {
+		super(msg, e);
+		this.msg = msg;
+	}
+
+	public BDException(String msg, int code) {
+		super(msg);
+		this.msg = msg;
+		this.code = code;
+	}
+
+	public BDException(String msg, int code, Throwable e) {
+		super(msg, e);
+		this.msg = msg;
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+
+}

arch-base/src/main/java/org/arch/exception/BaseException.java

+package org.arch.exception;
+
+import lombok.Data;
+import org.arch.enums.ExceptionEnum;
+
+/**
+ * 基础错误
+ */
+@Data
+public class BaseException extends Exception{
+
+
+    private int code;
+
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * 错误实例化
+     * @param code 错误码
+     * @param msg 错误信息
+     */
+    public BaseException(int code,String msg){
+        super(msg);
+        this.code = code;
+    }
+
+    /**
+     * 错误实例化
+     * @param exceptionEnum 错误枚举
+     */
+    public BaseException(ExceptionEnum exceptionEnum){
+        super(exceptionEnum.getMsg());
+        this.code = exceptionEnum.getCode();
+    }
+}

arch-base/src/main/java/org/arch/exception/CommonException.java

+package org.arch.exception;
+
+import cn.hutool.core.util.StrUtil;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 通用异常
+ *
+ * @date 2020/4/8 15:54
+ */
+@ApiModel(description = "通用异常")
+@Getter
+@Setter
+public class CommonException extends RuntimeException {
+
+    private Integer code;
+
+    private String msg;
+
+    public CommonException() {
+        super("服务器异常");
+        this.code = 500;
+        this.msg = "服务器异常";
+    }
+
+    public CommonException(String msg, Object... arguments) {
+        super(StrUtil.format(msg, arguments));
+        this.code = 500;
+        this.msg = StrUtil.format(msg, arguments);
+    }
+
+    public CommonException(Integer code, String msg, Object... arguments) {
+        super(StrUtil.format(msg, arguments));
+        this.code = code;
+        this.msg = StrUtil.format(msg, arguments);
+    }
+}

arch-base/src/main/java/org/arch/exception/GlobalExceptionTranslator.java

+package org.arch.exception;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.arch.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import java.util.stream.Collectors;
+
+/**
+ * 全局错误处理
+ */
+@RestControllerAdvice
+public class GlobalExceptionTranslator {
+
+    private Logger log = LoggerFactory.getLogger(GlobalExceptionTranslator.class);
+
+    @ExceptionHandler(value = BaseException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, BaseException be) {
+        be.printStackTrace();
+        log.error(be.getMessage(), be);
+        return Result.error(be.getCode(), be.getMessage());
+    }
+
+    @ExceptionHandler(value = BDException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, BDException be) {
+        be.printStackTrace();
+        log.error(be.getMessage(), be);
+        return Result.error(be.getCode(), be.getMessage());
+    }
+
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, IllegalArgumentException be) {
+        be.printStackTrace();
+        log.error(be.getMessage(), be);
+        return Result.error(be.getMessage());
+    }
+
+    @ExceptionHandler(value = AuthenticationException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, AuthenticationException ae) {
+        ae.printStackTrace();
+        log.error(ae.getMessage(), ae);
+        return Result.error(401, "登录失效或者登录验证失败！");
+    }
+
+    /**
+     * 统一处理请求参数校验(实体对象传参)
+     *
+     * @param e HttpMessageNotReadableException异常信息
+     * @return 响应数据
+     */
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public Result handleBindException(HttpMessageNotReadableException e) {
+        return Result.error("请求参数错误");
+    }
+
+    /**
+     * MethodArgumentNotValidException-Spring封装的参数验证异常处理
+     * <p>MethodArgumentNotValidException：作用于 @Validated @Valid 注解，接收参数加上@RequestBody注解（json格式）才会有这种异常。</p>
+     *
+     * @param e MethodArgumentNotValidException异常信息
+     * @return 响应数据
+     */
+    @ExceptionHandler(value = MethodArgumentNotValidException.class)
+    public Result<?> methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) {
+        String msg = e.getBindingResult().getFieldErrors()
+                .stream()
+                .map(n -> String.format("%s: %s", n.getField(), n.getDefaultMessage()))
+                .reduce((x, y) -> String.format("%s; %s", x, y))
+                .orElse("参数输入有误");
+        log.error("MethodArgumentNotValidException异常，参数校验异常：{}", msg);
+        return Result.error(msg);
+    }
+
+    /**
+     * BindException异常处理
+     * <p>BindException: 作用于@Validated @Valid 注解，仅对于表单提交有效，对于以json格式提交将会失效</p>
+     *
+     * @param e BindException异常信息
+     * @return 响应数据
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(BindException.class)
+    public Result<?> bindExceptionHandler(BindException e) {
+        String msg = e.getBindingResult().getFieldErrors()
+                .stream()
+                .map(n -> String.format("%s: %s", n.getField(), n.getDefaultMessage()))
+                .reduce((x, y) -> String.format("%s; %s", x, y))
+                .orElse("参数输入有误");
+        log.error("BindException异常，参数校验异常：{}", msg);
+        return Result.error(msg);
+    }
+
+    /**
+     * ConstraintViolationException-jsr规范中的验证异常，嵌套检验问题
+     * <p>ConstraintViolationException：作用于 @NotBlank @NotNull @NotEmpty 注解，校验单个String、Integer、Collection等参数异常处理。</p>
+     * <p>注：Controller类上必须添加@Validated注解，否则接口单个参数校验无效</p>
+     *
+     * @param e ConstraintViolationException异常信息
+     * @return 响应数据
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(value = ConstraintViolationException.class)
+    public Result<?> constraintViolationExceptionHandler(ConstraintViolationException e) {
+        String msg = e.getConstraintViolations()
+                .stream()
+                .map(ConstraintViolation::getMessage)
+                .collect(Collectors.joining("; "));
+
+        log.error("ConstraintViolationException，参数校验异常：{}", msg);
+        return Result.error(msg);
+    }
+
+    @ExceptionHandler(value = Exception.class)
+    @ResponseBody
+    public Result handleError(Exception e) {
+        log.info("系统错误:" + e.getMessage());
+        e.printStackTrace();
+        return Result.error();
+    }
+}

arch-base/src/main/java/org/arch/utils/AesCipherUtil.java

+package org.arch.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.*;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * AES加密解密工具类
+ * @author dolyw.com
+ * @date 2018/8/31 16:39
+ */
+@Component
+public class AesCipherUtil {
+
+    /**
+     * AES密码加密私钥(Base64加密)
+     */
+    private static String encryptAESKey;
+    // private static final byte[] KEY = { 1, 1, 33, 82, -32, -85, -128, -65 };
+
+    //@Value("${encryptAESKey}")
+    public void setEncryptAESKey(String encryptAESKey) {
+        AesCipherUtil.encryptAESKey = encryptAESKey;
+    }
+
+    /**
+     * logger
+     */
+    private static final Logger logger = LoggerFactory.getLogger(AesCipherUtil.class);
+
+    /**
+     * 加密
+     * @param str
+     * @return java.lang.String
+     * @author dolyw.com
+     * @date 2018/8/31 16:56
+     */
+    public static String enCrypto(String str) {
+        try {
+//            Security.addProvider(new com.sun.crypto.provider.SunJCE());
+            // 实例化支持AES算法的密钥生成器(算法名称命名需按规定，否则抛出异常)
+            // KeyGenerator 提供对称密钥生成器的功能，支持各种算法
+            KeyGenerator keygen = KeyGenerator.getInstance("AES");
+            // 将私钥encryptAESKey先Base64解密后转换为byte[]数组按128位初始化
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            secureRandom.setSeed(Base64ConvertUtil.decode(encryptAESKey).getBytes());
+            keygen.init(128, secureRandom);
+            // SecretKey 负责保存对称密钥 生成密钥
+            SecretKey desKey = keygen.generateKey();
+            // 生成Cipher对象,指定其支持的AES算法，Cipher负责完成加密或解密工作
+            Cipher c = Cipher.getInstance("AES");
+            // 根据密钥，对Cipher对象进行初始化，ENCRYPT_MODE表示加密模式
+            c.init(Cipher.ENCRYPT_MODE, desKey);
+            byte[] src = str.getBytes();
+            // 该字节数组负责保存加密的结果
+            byte[] cipherByte = c.doFinal(src);
+            // 先将二进制转换成16进制，再返回Base64加密后的String
+            return Base64ConvertUtil.encode(HexConvertUtil.parseByte2HexStr(cipherByte));
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+            logger.error("getInstance()方法异常:{}", e.getMessage());
+            throw new RuntimeException("getInstance()方法异常:" + e.getMessage());
+        } catch (UnsupportedEncodingException e) {
+            logger.error("Base64加密异常:{}", e.getMessage());
+            throw new RuntimeException("Base64加密异常:" + e.getMessage());
+        } catch (InvalidKeyException e) {
+            logger.error("初始化Cipher对象异常:{}", e.getMessage());
+            throw new RuntimeException("初始化Cipher对象异常:" + e.getMessage());
+        } catch (IllegalBlockSizeException | BadPaddingException e) {
+            logger.error("加密异常，密钥有误:{}", e.getMessage());
+            throw new RuntimeException("加密异常，密钥有误:" + e.getMessage());
+        }
+    }
+
+    /**
+     * 解密
+     * @param str
+     * @return java.lang.String
+     * @author dolyw.com
+     * @date 2018/8/31 16:56
+     */
+    public static String deCrypto(String str) {
+        try {
+//            Security.addProvider(new com.sun.crypto.provider.SunJCE());
+            // 实例化支持AES算法的密钥生成器(算法名称命名需按规定，否则抛出异常)
+            // KeyGenerator 提供对称密钥生成器的功能，支持各种算法
+            KeyGenerator keygen = KeyGenerator.getInstance("AES");
+            // 将私钥encryptAESKey先Base64解密后转换为byte[]数组按128位初始化
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            secureRandom.setSeed(Base64ConvertUtil.decode(encryptAESKey).getBytes());
+            keygen.init(128, secureRandom);
+            // SecretKey 负责保存对称密钥 生成密钥
+            SecretKey desKey = keygen.generateKey();
+            // 生成Cipher对象,指定其支持的AES算法，Cipher负责完成加密或解密工作
+            Cipher c = Cipher.getInstance("AES");
+            // 根据密钥，对Cipher对象进行初始化，DECRYPT_MODE表示解密模式
+            c.init(Cipher.DECRYPT_MODE, desKey);
+            // 该字节数组负责保存解密的结果，先对str进行Base64解密，将16进制转换为二进制
+            byte[] cipherByte = c.doFinal(HexConvertUtil.parseHexStr2Byte(Base64ConvertUtil.decode(str)));
+            return new String(cipherByte);
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+            logger.error("getInstance()方法异常:{}", e.getMessage());
+            throw new RuntimeException("getInstance()方法异常:" + e.getMessage());
+        } catch (UnsupportedEncodingException e) {
+            logger.error("Base64解密异常:{}", e.getMessage());
+            throw new RuntimeException("Base64解密异常:" + e.getMessage());
+        } catch (InvalidKeyException e) {
+            logger.error("初始化Cipher对象异常:{}", e.getMessage());
+            throw new RuntimeException("初始化Cipher对象异常:" + e.getMessage());
+        } catch (IllegalBlockSizeException | BadPaddingException e) {
+            logger.error("解密异常，密钥有误:{}", e.getMessage());
+            throw new RuntimeException("解密异常，密钥有误:" + e.getMessage());
+        }
+    }
+}

arch-gateway/src/main/java/org/arch/util/Base64ConvertUtil.java → arch-base/src/main/java/org/arch/utils/Base64ConvertUtil.java

-package org.arch.util;
+package org.arch.utils;
 
 
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.util.Base64;
 import java.util.Base64;

arch-base/src/main/java/org/arch/utils/HexConvertUtil.java

+package org.arch.utils;
+
+/**
+ * 进制转换工具
+ * @author dolyw.com
+ * @date 2018/8/31 17:23
+ */
+public class HexConvertUtil {
+
+    private HexConvertUtil() {}
+
+    /**
+     * 1
+     */
+    private static final Integer INTEGER_1 = 1;
+
+    /**
+     * 2
+     */
+    private static final Integer INTEGER_2 = 2;
+
+    /**
+     * 将二进制转换成16进制
+     * @param bytes
+     * @return java.lang.String
+     * @author dolyw.com
+     * @date 2018/8/31 17:20
+     */
+    public static String parseByte2HexStr(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte buff : bytes) {
+            String hex = Integer.toHexString(buff & 0xFF);
+            if (hex.length() == INTEGER_1) {
+                hex = '0' + hex;
+            }
+            sb.append(hex.toUpperCase());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 将16进制转换为二进制
+     * @param hexStr
+     * @return byte[]
+     * @author dolyw.com
+     * @date 2018/8/31 17:21
+     */
+    public static byte[] parseHexStr2Byte(String hexStr) {
+        if (hexStr.length() < INTEGER_1) {
+            return null;
+        }
+        byte[] result = new byte[hexStr.length() / INTEGER_2];
+        for (int i = 0, len = hexStr.length() / INTEGER_2; i < len; i++) {
+            int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);
+            int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16);
+            result[i] = (byte) (high * 16 + low);
+        }
+        return result;
+    }
+}

arch-gateway/src/main/java/org/arch/util/JwtUtil.java → arch-base/src/main/java/org/arch/utils/JwtUtil.java

-package org.arch.util;
+package org.arch.utils;
 
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
+import org.arch.exception.BDException;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.Date;
 
 
-import static org.springframework.web.context.request.RequestContextHolder.getRequestAttributes;
-
 /**
 /**
  * JAVA-JWT工具类
  * JAVA-JWT工具类
  * @author Wang926454
  * @author Wang926454
@@ -44,14 +41,7 @@ public class JwtUtil {
     public void setAccessTokenExpireTime(String accessTokenExpireTime) {
     public void setAccessTokenExpireTime(String accessTokenExpireTime) {
         JwtUtil.accessTokenExpireTime = accessTokenExpireTime;
         JwtUtil.accessTokenExpireTime = accessTokenExpireTime;
     }
     }
-    public static HttpServletRequest getRequest() {
-//        RequestAttributes requestAttributes = getRequestAttributes();
-        return  ((ServletRequestAttributes) getRequestAttributes()).getRequest();
-    }
-    public static String getToken() {
-        HttpServletRequest request = getRequest();
-        return request.getHeader("Authorization");
-    }
+
     @Value("${encryptJWTKey}")
     @Value("${encryptJWTKey}")
     public void setEncryptJWTKey(String encryptJWTKey) {
     public void setEncryptJWTKey(String encryptJWTKey) {
         JwtUtil.encryptJWTKey = encryptJWTKey;
         JwtUtil.encryptJWTKey = encryptJWTKey;
@@ -67,15 +57,14 @@ public class JwtUtil {
     public static boolean verify(String token) {
     public static boolean verify(String token) {
         try {
         try {
             // 帐号加JWT私钥解密
             // 帐号加JWT私钥解密
-            String secret = getClaim(token,"account") + Base64ConvertUtil.decode(encryptJWTKey);
+            String secret = getClaim(token, Constant.ACCOUNT) + Base64ConvertUtil.decode(encryptJWTKey);
             Algorithm algorithm = Algorithm.HMAC256(secret);
             Algorithm algorithm = Algorithm.HMAC256(secret);
             JWTVerifier verifier = JWT.require(algorithm).build();
             JWTVerifier verifier = JWT.require(algorithm).build();
             verifier.verify(token);
             verifier.verify(token);
             return true;
             return true;
-        } catch (Exception e) {
+        } catch (UnsupportedEncodingException e) {
             logger.error("JWTToken认证解密出现UnsupportedEncodingException异常:{}", e.getMessage());
             logger.error("JWTToken认证解密出现UnsupportedEncodingException异常:{}", e.getMessage());
-            return false;
-//            throw new RuntimeException("JWTToken认证解密出现UnsupportedEncodingException异常:" + e.getMessage());
+            throw new RuntimeException("JWTToken认证解密出现UnsupportedEncodingException异常:" + e.getMessage());
         }
         }
     }
     }
 
 
@@ -105,9 +94,9 @@ public class JwtUtil {
      * @param currentTimeMillis
      * @param currentTimeMillis
      * @return
      * @return
      */
      */
-    public static String sign(String account, String currentTimeMillis) throws Exception {
+    public static String sign(String account, String currentTimeMillis) {
         if(StringUtils.isBlank(account)){
         if(StringUtils.isBlank(account)){
-            throw new Exception("用户账户信息为空！");
+            throw new BDException("用户账户信息为空！");
         }
         }
         try {
         try {
             // 帐号加JWT私钥加密
             // 帐号加JWT私钥加密

arch-base/src/main/java/org/arch/utils/RequestUtils.java

+package org.arch.utils;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author 29321
+ * @year 2020
+ */
+public class RequestUtils {
+
+    public static HttpServletResponse getResponse() {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletResponse response = servletRequestAttributes.getResponse();
+        return response;
+    }
+
+
+    public static HttpServletRequest getRequest() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+        return request;
+    }
+
+
+    /**
+     * @Description 获得头部
+     * @author Viven
+     */
+    public static String getHeader(HttpServletRequest request, String name) {
+        return request.getHeader(name);
+    }
+
+
+    /**
+     * 获得请求的头信息
+     *
+     * @return
+     */
+    public static String getAgent(HttpServletRequest request) {
+        String agent = request.getHeader("User-Agent");
+        return agent;
+    }
+
+
+    /**
+     * 获取请求来的ip地址
+     *
+     * @param request
+     * @return
+     */
+    public static String getRemoteIp(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("X-Real-IP");//nginx 服务器
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        if (ip != null && ip.length() > 15) {
+            if (ip.indexOf(",") > 0) {
+                ip = ip.substring(0, ip.indexOf(","));
+            }
+        }
+        return ip;
+    }
+}

arch-clouds/common/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.arch</groupId>
+        <artifactId>arch-clouds</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <name>公共服务模块</name>
+    <artifactId>common</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.arch</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

arch-clouds/mybatis/src/main/java/org/arch/common/entity/BaseEntity.java → arch-clouds/common/src/main/java/org/arch/common/BaseEntity.java

-package org.arch.common.entity;
+package org.arch.common;
 
 
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 
 import java.util.Date;
 import java.util.Date;
 
 

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AdsParserContentDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.enums.ArchiPrjReviewEnum;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "goverAdsParserContentDTO对象", description = "概设解析内容")
+public class AdsParserContentDTO {
+
+    /**
+     * 需求id
+     */
+    @ApiModelProperty(value = "需求id")
+    private Integer needId;
+
+    /**
+     * 需求名称
+     */
+    @ApiModelProperty(value = "需求名称")
+    private String needName;
+
+    /**
+     * 批次年度
+     */
+    @ApiModelProperty(value = "批次年度")
+    private String year;
+
+
+    /**
+     * 批次年度
+     */
+    @ApiModelProperty(value = "批次年度")
+    private String buildtype;
+
+    @ApiModelProperty(value = "技术路线表，架构遵从表，功能清单，数据实体清单，系统集成清单")
+    private ArchiPrjReviewEnum archiPrjReviewEnum;
+
+    /**
+     * 书签集合
+     */
+    @ApiModelProperty(value = "标签范围")
+    private List<DocMarkTag> docMarkTag;
+
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppArchiConRequireDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 系统架构管控要求
+ * </p>
+ *
+ * @author java
+ * @since 2024-02-27
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "AppArchiConRequireDTO对象", description = "系统架构管控要求")
+public class AppArchiConRequireDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "项目ID")
+    private Long prjId;
+
+    @ApiModelProperty(value = "项目编码")
+    private String prjCode;
+
+    @ApiModelProperty(value = "项目名称")
+    private String prjName;
+
+    @ApiModelProperty(value = "系统ID")
+    private Long appId;
+
+    @ApiModelProperty(value = "系统编码")
+    private String appCode;
+
+    @ApiModelProperty(value = "系统名称")
+    private String appName;
+
+    @ApiModelProperty(value = "项目经理")
+    private String projectManager;
+
+    @ApiModelProperty(value = "实际竣工时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date cmplDate;
+
+    @ApiModelProperty(value = "项目性质，1:新建、2:续建")
+    private Long prjPlanClass;
+
+    @ApiModelProperty(value = "建管单位")
+    private Long manageOrgId;
+
+    @ApiModelProperty(value = "建管部门")
+    private Long manageDeptId;
+
+    @ApiModelProperty(value = "建设类型")
+    private Byte buildType;
+
+    @ApiModelProperty(value = "承建单位")
+    private Byte buildOrg;
+
+    @ApiModelProperty(value = "前期项目ID")
+    private Long agoPrjId;
+
+    @ApiModelProperty(value = "前期项目编码")
+    private String agoPrjCode;
+
+    @ApiModelProperty(value = "前期项目名称")
+    private String agoPrjName;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    @ApiModelProperty(value = "JSON综合字段")
+    private List<JSONObject> filesValue;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppArchiConRequireReviewDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.enums.ArchiPrjReviewEnum;
+
+/**
+ * <p>
+ * 系统架构管控要求
+ * </p>
+ *
+ * @author java
+ * @since 2024-02-27
+ */
+@Data
+@ApiModel(value = "AppArchiConRequireDTO对象", description = "系统架构管控要求")
+public class AppArchiConRequireReviewDTO {
+
+    @ApiModelProperty(value = "审查类型")
+    private ArchiPrjReviewEnum reviewEnum;
+
+    @ApiModelProperty(value = "项目Id")
+    private Long prjId;
+
+    @ApiModelProperty(value = "评审意见")
+    private String reviewSuggestion;
+
+    @ApiModelProperty(value = "评审状态")
+    private Integer reviewState;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppArchiPostilReqDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.enums.ArchiPrjReviewEnum;
+
+@Data
+public class AppArchiPostilReqDTO {
+    @ApiModelProperty(value = "项目Id")
+    private Long prjId;
+    @ApiModelProperty(value = "业务ID类型：1项目附件，2需求附件")
+    private Long busiIdType;
+    @ApiModelProperty(value = "业务资料类型: 技术规范书\n" +
+            "可行性研究报告\n" +
+            "需求规格说明书\n" +
+            "概要设计说明书\n" +
+            "安全防护方案")
+    private String busiFileName;
+
+    @ApiModelProperty(value = "当前页")
+    private Integer current = 1;
+
+    @ApiModelProperty(value = "每页显示条数")
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "审查类型")
+    private ArchiPrjReviewEnum reviewEnum;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppInfoDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统列表信息
+ * </p>
+ *
+ * @author java
+ * @since 2024-02-27
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "AppInfo对象", description = "系统信息传输对象")
+public class AppInfoDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "系统应用ID")
+    private Long appId;
+
+    @ApiModelProperty(value = "系统编码")
+    private String appCode;
+
+    @ApiModelProperty(value = "系统名称")
+    private String appName;
+
+    @ApiModelProperty(value = "上线时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date onlineDate;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "建管单位")
+    private Long manageOrgId;
+
+    @ApiModelProperty(value = "建管部门")
+    private Long manageDeptId;
+
+    @ApiModelProperty(value = "建管单位名称")
+    private String manageOrgName;
+
+    @ApiModelProperty(value = "建管部门名称")
+    private String manageDeptName;
+
+    @ApiModelProperty(value = "承建类型")
+    private Byte buildType;
+
+    @ApiModelProperty(value = "承建单位")
+    private Byte buildOrg;
+
+    @ApiModelProperty(value = "承建单位名称")
+    private String buildOrgName;
+
+    @ApiModelProperty(value = "项目经理")
+    private String projectManager;
+
+    @ApiModelProperty(value = "前期项目")
+    private Long orignProjectId;
+
+    @ApiModelProperty(value = "关联系统")
+    private Long relationAppId;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityAssetsDTO.java

+package org.arch.common.archoverall.dto;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "中台服务清单请求参数", description = "中台服务清单请求参数")
+public class ArchiAbilityAssetsDTO {
+
+    @ApiModelProperty(value = "服务清单ID")
+//    @TableId(value = "inventory_id", type = IdType.INPUT)
+    private Long inventoryId;
+
+    @ApiModelProperty(value = "中台服务编码")
+    private String abilityCode;
+    @ApiModelProperty(value = "中台服务名称")
+    private String abilityName;
+
+    @ApiModelProperty(value = "架构资产ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+
+    @ApiModelProperty(value = "架构资产编码")
+    private String assetCode;
+    @ApiModelProperty(value = "架构资产名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "架构类型Id")
+    private String archiTypeId;
+
+    @ApiModelProperty(value = "架构类型")
+    private String archiType;
+
+    @ApiModelProperty(value = "资产的父级节点串")
+    private String parentAssetIds;
+
+    @ApiModelProperty(value = "资产的父级节点名称串")
+    private String parentAssetNames;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityAssetsQryReqDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "中台服务清单关联资产表请求参数", description = "中台服务清单关联资产表请求参数")
+public class ArchiAbilityAssetsQryReqDTO extends BasePageEntity {
+    @ApiModelProperty(value = "服务清单ID")
+    private Long inventoryId;
+
+    @ApiModelProperty(value = "架构类型Id")
+    private String archiTypeId;
+
+    @ApiModelProperty(value = "架构类型")
+    private String archiType;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityAssetsReqDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "中台服务清单关联资产表请求参数", description = "中台服务清单关联资产表请求参数")
+public class ArchiAbilityAssetsReqDTO {
+
+    List<ArchiAbilityAssetsDTO> assetsDTOS;
+
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInveStatReqDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.enums.ArchiAbilityInventoryEnum;
+
+@Data
+@ApiModel(value = "中台服务清单根据指标下钻资产列表", description = "中台服务清单根据指标下钻资产列表")
+public class ArchiAbilityInveStatReqDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "资源类型 1 中台服务清单 2 业务信息 3 应用服务信息 4 数据实体信息 5 技术组件信息")
+    private String abilitySource;
+
+
+    @ApiModelProperty(value = "服务清单ID")
+    private Long inventoryId;
+
+    @ApiModelProperty(value = "架构类型Id")
+    private String archiTypeId;
+
+    @ApiModelProperty(value = "架构类型")
+    private String archiType;
+    @ApiModelProperty(value = "指标统计有关的枚举类")
+    private ArchiAbilityInventoryEnum inventoryEnum;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInveStatResDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+@ApiModel(value = "中台服务清单根据指标下钻动态表格", description = "中台服务清单根据指标下钻动态表格")
+@Data
+public class ArchiAbilityInveStatResDTO {
+
+    @ApiModelProperty(value = "列表表格表头")
+    private ArrayList<String> titleList;
+
+//    @ApiModelProperty(value = "列表数据")
+//    private ArrayList<ArrayList<String>> dataList;
+
+    @ApiModelProperty(value = "列表数据")
+    private ArrayList<LinkedHashMap<String,Object>> dataList;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryAppDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "应用服务信息请求参数", description = "应用服务信息请求参数")
+public class ArchiAbilityInventoryAppDTO extends BasePageEntity {
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryBusDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "业务信息请求参数", description = "业务信息请求参数")
+public class ArchiAbilityInventoryBusDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "中台服务名称")
+    private String abilityName;
+
+    @ApiModelProperty(value = "资源类型 1 中台服务清单 2 业务信息 3 应用服务信息 4 数据实体信息 5 技术组件信息")
+    private String abilitySource;
+
+    @ApiModelProperty(value = "业务活动名称")
+    private String businessActName;
+
+
+    @ApiModelProperty(value = "统计时间")
+    private String statTime;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryDTO.java

+package org.arch.common.archoverall.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 能力清单
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-11
+ */
+@Data
+@ApiModel(value = "能力清单", description = "能力清单传输对象")
+public class ArchiAbilityInventoryDTO  {
+
+    @ApiModelProperty(value = "当前页")
+    private Integer current;
+
+    @ApiModelProperty(value = "每页显示条数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "总条数")
+    private Integer total;
+
+    @ApiModelProperty(value = "能力清单ID")
+    private Long inventoryId;
+
+    @ApiModelProperty(value = "资源名称")
+    private String inventoryName;
+
+    @ApiModelProperty(value = "能力来源")
+    private String abilitySource;
+
+    @ApiModelProperty(value = "资源类型（1：业务中台服务能力，2：数据中台资源目录，3：数据中台资源服务，4：技术中台公共技术能力）")
+    private String abilityType;
+
+    @ApiModelProperty(value = "所属部门id")
+    private Integer departId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String departName;
+
+    @ApiModelProperty(value = "单位id")
+    private Integer compId;
+
+    @ApiModelProperty(value = "单位名称")
+    private String compName;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date publishTime;
+
+    @ApiModelProperty(value = "简介")
+    private String description;
+
+    @ApiModelProperty(value = "版本")
+    private  String inventoryVersion;
+
+    @ApiModelProperty(value = "是否权威数据（0：否；1：是）")
+    private  String isAuthority;
+
+    @ApiModelProperty(value = "是否盘点数据（0：否；1：是）")
+    private  String isInventory;
+
+    @ApiModelProperty(value = "数据来源方式（1：接口传递；2：人工录入）")
+    private  String sourceType;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    private Long lastUpdateMan;
+
+    @ApiModelProperty(value = "是否删除（0：未删除；1：已删除）")
+    private  Byte delFlag;
+    
+    @ApiModelProperty(value = "平台来源")
+    private String platformSource;
+
+    @ApiModelProperty(value = "服务类型")
+    private Integer serveType;
+
+    @ApiModelProperty(value = "服务状态")
+    private Integer serveState;
+
+    @ApiModelProperty(value = "服务描述")
+    private String serveRemark;
+
+    @ApiModelProperty(value = "模块")
+    private String module;
+    
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "中台服务编码")
+//    @TableField(exist = false)
+    private String abilityCode;
+    @ApiModelProperty(value = "中台服务名称")
+//    @TableField(exist = false)
+    private String abilityName;
+
+    @ApiModelProperty(value = "中台类型id")
+//    @TableField(exist = false)
+    private Integer midGroundId;
+
+    @ApiModelProperty(value = "中台类型名称")
+//    @TableField(exist = false)
+    private String midGroundName;
+
+    @ApiModelProperty(value = "中台名称id")
+//    @TableField(exist = false)
+    private Integer midPlatformId;
+
+    @ApiModelProperty(value = "中台名称")
+//    @TableField(exist = false)
+    private String midPlatformName;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryDataDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "数据实体信息请求参数", description = "数据实体信息请求参数")
+public class ArchiAbilityInventoryDataDTO extends BasePageEntity {
+	
+	@ApiModelProperty(value = "中台服务名称")
+    private String abilityName;
+	
+	@ApiModelProperty(value = "统计时间")
+    private String statTime;
+	
+	@ApiModelProperty(value = "中台类型")
+    private String midGroundType;
+
+    @ApiModelProperty(value = "中台名称")
+    private String midGroundName;
+    
+    @ApiModelProperty(value = "资产ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+    
+    @ApiModelProperty(value = "服务编码")
+    private String assetCode;
+    
+    @ApiModelProperty(value = "资产名称")
+    private String assetName;
+    
+    @ApiModelProperty(value = "架构类型（1 业务架构、2 应用架构、3 数据架构、4 技术架构、5 安全架构）")
+    private Integer archiTypeId;
+
+    @ApiModelProperty(value = "统计类型（1：服务清单关联统计；2：业务关联统计；3：应用关联统计；4：数据实体关联统计；5：技术组件关联统计）")
+    private Integer statType;
+    
+    @ApiModelProperty(value = "分层统计（如果没有多层统计，关键字统计字段为空）")
+    private Integer statKey;
+    
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryReqDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "中台服务清单请求参数", description = "中台服务清单请求参数")
+public class ArchiAbilityInventoryReqDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "中台服务清单id")
+    private Long inventoryId;
+    @ApiModelProperty(value = "中台服务名称")
+    private String abilityName;
+
+    @ApiModelProperty(value = "资源类型 1 中台服务清单 2 业务信息 3 应用服务信息 4 数据实体信息 5 技术组件信息")
+    private String abilitySource;
+
+    @ApiModelProperty(value = "中台类型id")
+//    @TableField(exist = false)
+    private String midGroundId;
+
+    @ApiModelProperty(value = "中台类型名称")
+//    @TableField(exist = false)
+    private String midGroundName;
+
+    @ApiModelProperty(value = "中台名称id")
+//    @TableField(exist = false)
+    private String midPlatformId;
+
+    @ApiModelProperty(value = "中台名称")
+//    @TableField(exist = false)
+    private String midPlatformName;
+
+    @ApiModelProperty(value = "统计时间")
+    private String statTime;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date publishTime;
+
+
+
+
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryResDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "能力清单", description = "能力清单传输对象")
+public class ArchiAbilityInventoryResDTO {
+
+    @ApiModelProperty(value = "中台服务编码")
+    private String abilityCode;
+    @ApiModelProperty(value = "中台服务名称")
+    private String abilityName;
+    @ApiModelProperty(value = "服务类型 :1聚合服务，2规则服务，3数据服务，4原子服务")
+    private String serveType;
+
+    @ApiModelProperty(value = "模块")
+    private String module;
+
+    @ApiModelProperty(value = "中台类型")
+    private String midGroundType;
+
+    @ApiModelProperty(value = "中台名称")
+    private String midGroundName;
+    @ApiModelProperty(value = "服务调用频率")
+    private Integer serviceInvFreq;
+    @ApiModelProperty(value = "服务调用方数量")
+    private Integer serviceInvNum;
+    @ApiModelProperty(value = "操作实体数量")
+    private Integer oprEntityNum;
+    @ApiModelProperty(value = "支撑技术组件数量")
+    private Integer supportTecModNum;
+
+    @ApiModelProperty(value = "支撑的业务活动数量")
+    private Integer suppportBusActNum;
+
+    @ApiModelProperty(value = "关联的中台服务数量")
+    private Integer relMidServiceNum;
+
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date publishTime;
+
+
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryTecDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "技术组件信息请求参数", description = "技术组件信息请求参数")
+public class ArchiAbilityInventoryTecDTO extends BasePageEntity {
+	
+	@ApiModelProperty(value = "中台服务名称")
+    private String abilityName;
+
+    @ApiModelProperty(value = "资源类型 1 中台服务清单 2 业务信息 3 应用服务信息 4 数据实体信息 5 技术组件信息")
+    private String abilitySource;
+
+    @ApiModelProperty(value = "业务活动名称")
+    private String businessActName;
+
+    @ApiModelProperty(value = "统计时间")
+    private String statTime;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetCommonDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 资产架构
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-09
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "资产架构", description = "资产架构传输对象")
+public class ArchiAssetCommonDTO extends BasePageEntity {
+
+	@ApiModelProperty(value = "当前页")
+    private Integer current;
+	
+    @ApiModelProperty(value = "每页显示条数")
+    private Integer pageSize;
+    
+    @ApiModelProperty(value = "总条数")
+    private Integer total;
+
+    @ApiModelProperty(value = "架构组件ID")
+    private Long assetId;
+
+    @ApiModelProperty(value = "架构组件名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "资产编码，采用8位阶梯设计编码，通过编码识别层级")
+    private String assetCode;
+
+    @ApiModelProperty(value = "上级架构组件ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentAssetId;
+
+    @ApiModelProperty(value = "上级架构组件名称")
+    private String parentAssetName;
+
+    @ApiModelProperty(value = "父级编码")
+    private String parentCode;
+
+    @ApiModelProperty(value = "版本ID")
+    private Long versionId;
+
+    @ApiModelProperty(value = "架构元素Id")
+    private Long archiEleId;
+
+    @ApiModelProperty(value = "架构类型")
+    private String archiType;
+
+    @ApiModelProperty(value = "架构归属")
+    private Byte archiBelongId;
+    
+    @ApiModelProperty(value = "架构资产状态（字典中读取，1：现状态；2：目标态）")
+    private Byte archiAssetState;
+    
+    @ApiModelProperty(value = "架构资产类型（架构视图、架构演进路线、业务活动资产等）,必传")
+    private Byte archiAssetType;
+    
+    @ApiModelProperty(value = "架构阶段（1：总体架构；2：系统架构）,必传")
+    private Integer archiStage;
+    
+    @ApiModelProperty(value = "架构资产类型关联的ID，目前架构视图关联archi_view表,必传")
+    private Long archiAssetTypeId;
+    
+    @ApiModelProperty(value = "关联资产，实际用作兄弟关系连线，可支持多个target")
+    private List<JSONObject> targetAsset;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    private Long lastUpdateMan;
+
+    @ApiModelProperty(value = "JSON综合字段；将架构元素的属性和值利用Json数据存储")
+    private List<JSONObject> fieldsValue;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String column01;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String column02;
+    
+    @ApiModelProperty(value = "组件类型名称")
+    private String eleName;
+
+    @ApiModelProperty(value = "旧版本ID")
+    private Long orignVersionId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否首页展示 0 展示   1  不展示")
+    private Byte isShow;
+
+    @ApiModelProperty(value = "原架构ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orignAssetId;
+    
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    private Integer delFlag;
+    
+    @ApiModelProperty(value = "资产常量,必传。")
+    private String assetConstant;
+    
+    @ApiModelProperty(value = "版本")
+    private String version;
+
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+    
+    @ApiModelProperty(value = "元素id集合")
+    private List<Long> eleIdList;
+    
+    @ApiModelProperty(value = "架构视图 ID")
+    private Long archiViewId;
+    
+    @ApiModelProperty(value = "承建类型:1统推，2自建")
+    private Integer buildType;
+    
+    @ApiModelProperty(value = "是否继承:1是，2否")
+    private Integer isExtend;
+    
+    @ApiModelProperty(value = "项目ID")
+    private Long prjId;
+
+    @ApiModelProperty(value = "项目编码")
+    private String prjCode;
+
+    @ApiModelProperty(value = "项目名称")
+    private String prjName;
+
+    @ApiModelProperty(value = "系统ID")
+    private Long appId;
+
+    @ApiModelProperty(value = "系统编码")
+    private String appCode;
+
+    @ApiModelProperty(value = "系统名称")
+    private String appName;
+    
+    @ApiModelProperty(value = "资产id集合")
+    private List<Long> assetIdList;
+    
+    @ApiModelProperty(value = "继承集合")
+    private List<ArchiAssetExtendDTO> extend;
+    
+    
+    
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.enums.ArchiAssetEnum;
+
+/**
+ * 资产DTO
+ *
+ * @author admin
+ * @date 2024/02/21
+ */
+@Data
+@ApiModel(value = "资产")
+public class ArchiAssetDTO {
+
+    @ApiModelProperty("资产ID")
+    private Long assetId;
+
+    @ApiModelProperty(value = "资产类型")
+    private ArchiAssetEnum assetEnum;
+
+    @ApiModelProperty(value = "资产名称")
+    private String assetName;
+
+    @ApiModelProperty("版本ID")
+    private Long versionId;
+
+    @ApiModelProperty("架构归属")
+    private String assertType;
+
+    @ApiModelProperty("架构归属ID")
+    private Long archiBelongId;
+
+    @ApiModelProperty(value = "架构资产状态（字典中读取，1：现状态；2：目标态）")
+    private Integer archiAssetState;
+
+    @ApiModelProperty("父资产ID")
+    private Long parentAssetId;
+
+    @ApiModelProperty("深度")
+    private Integer deep;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetEleRelaAddAndUpdateDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.arch.common.BaseEntity;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 架构资产关系
+ */
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(description = "架构资产关系")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArchiAssetEleRelaAddAndUpdateDTO extends BaseEntity {
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Long assetRelaId;
+
+    /**
+     * 资产关系名称
+     */
+    @ApiModelProperty(value = "资产关系名称")
+    private String rsName;
+
+    /**
+     * 元素 ID
+     */
+    @ApiModelProperty(value = "元素 ID")
+    @NotNull(message = "元素 ID不能为空")
+    private Long eleId;
+
+    /**
+     * 元素编码
+     */
+    @ApiModelProperty(value = "元素编码")
+    private String eleCode;
+
+    /**
+     * 元素名称
+     */
+    @ApiModelProperty(value = "元素名称")
+    private String eleName;
+
+    /**
+     * 关联元素 ID
+     */
+    @ApiModelProperty(value = "关联元素 ID")
+    @NotNull(message = "关联元素 ID不能为空")
+    private Long relaEleId;
+
+    /**
+     * 关联元素编码
+     */
+    @ApiModelProperty(value = "关联元素编码")
+    private String relaEleCode;
+
+    /**
+     * 关联元素名称
+     */
+    @ApiModelProperty(value = "关联元素名称")
+    private String relaEleName;
+
+    /**
+     * 是否跨架构（1：是 0：否）
+     */
+    @ApiModelProperty(value = "是否跨架构（1：是 0：否）")
+    private Byte across;
+
+    /**
+     * 图标ID
+     */
+    @ApiModelProperty(value = "图标ID")
+    @NotNull(message = "图标ID不能为空")
+    private String iconId;
+
+    /**
+     * 遵从元素关系，元素关系 ID
+     */
+    @ApiModelProperty(value = "遵从元素关系，元素关系 ID")
+    @NotNull(message = "遵从元素关系，元素关系 ID不能为空")
+    private Long eleRelaId;
+
+
+    @ApiModelProperty(value = "版本")
+    private String version;
+
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+}
\ No newline at end of file

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetEleRelaQueryDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 架构资产关系
+ */
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(description = "架构资产关系")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArchiAssetEleRelaQueryDTO extends BasePageEntity {
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Long assetRelaId;
+
+    /**
+     * 资产关系名称
+     */
+    @ApiModelProperty(value = "资产关系名称")
+    private String rsName;
+
+    /**
+     * 元素 ID
+     */
+    @ApiModelProperty(value = "元素 ID")
+    private Long eleId;
+
+    /**
+     * 元素编码
+     */
+    @ApiModelProperty(value = "元素编码")
+    private String eleCode;
+
+    /**
+     * 元素名称
+     */
+    @ApiModelProperty(value = "元素名称")
+    private String eleName;
+
+    /**
+     * 关联元素 ID
+     */
+    @ApiModelProperty(value = "关联元素 ID")
+    private Long relaEleId;
+
+    /**
+     * 关联元素编码
+     */
+    @ApiModelProperty(value = "关联元素编码")
+    private String relaEleCode;
+
+    /**
+     * 关联元素名称
+     */
+    @ApiModelProperty(value = "关联元素名称")
+    private String relaEleName;
+
+    /**
+     * 是否跨架构（1：是 0：否）
+     */
+    @ApiModelProperty(value = "是否跨架构（1：是 0：否）")
+    private Byte across;
+
+    /**
+     * 图标ID
+     */
+    @ApiModelProperty(value = "图标ID")
+    private String iconId;
+
+    /**
+     * 遵从元素关系，元素关系 ID
+     */
+    @ApiModelProperty(value = "遵从元素关系，元素关系 ID")
+    private Long eleRelaId;
+}
\ No newline at end of file

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetEvolutionRoadmapDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 架构演进路线资产
+ * </p>
+ *
+ * @author java
+ * @since 2024-02-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "ArchiAssetEvolutionRoadmap对象", description = "架构演进路线资产传输对象")
+public class ArchiAssetEvolutionRoadmapDTO extends BasePageEntity {
+	
+    @ApiModelProperty(value = "架构演进路线资产ID")
+    private Long evolutionId;
+
+    @ApiModelProperty(value = "演进编码")
+    private String evolutionCode;
+
+    @ApiModelProperty(value = "演进项")
+    private Integer evolutionItem;
+
+    @ApiModelProperty(value = "演进类型：1:演进策略  2:演进路线")
+    private Integer evolutionType;
+
+    @ApiModelProperty(value = "现状架构")
+    private String nowArchi;
+
+    @ApiModelProperty(value = "目标架构")
+    private String targetArchi;
+
+    @ApiModelProperty(value = "演进描述")
+    private String evolutionContent;
+
+    @ApiModelProperty(value = "状态： 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    private Long lastUpdateMan;
+
+    @ApiModelProperty(value = "删除标记（0：未删除；1：删除）")
+    private Integer delFlag;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetExtendDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 资产架构
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-09
+ */
+@Data
+@ApiModel(value = "资产架构", description = "系统资产架构继承对象")
+public class ArchiAssetExtendDTO implements Serializable {
+
+	@ApiModelProperty(value = "资产id集合")
+    private List<Long> assetIdList;
+    
+	@ApiModelProperty(value = "架构归属ID")
+    private String archiBelongId;
+    
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetFrameworkDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class ArchiAssetFrameworkDTO {
+
+    @ApiModelProperty(value = "架构组件ID")
+    @TableId(value = "asset_id", type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+
+    @ApiModelProperty(value = "架构组件名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "资产编码，采用8位阶梯设计编码，通过编码识别层级")
+    private String assetCode;
+
+    @ApiModelProperty(value = "上级架构组件ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentAssetId;
+
+    @ApiModelProperty(value = "上级架构组件名称")
+    private String parentAssetName;
+
+    @ApiModelProperty(value = "父级编码")
+    private String parentCode;
+
+    @ApiModelProperty(value = "版本ID")
+    private Long versionId;
+
+    @ApiModelProperty(value = "架构元素Id")
+    private Long archiEleId;
+
+    @ApiModelProperty(value = "架构类型")
+    private String archiType;
+
+    @ApiModelProperty(value = "架构归属")
+    private Byte archiBelongId;
+
+    @ApiModelProperty(value = "架构资产状态（字典中读取，1：现状态；2：目标态）")
+    private Byte archiAssetState;
+
+    @ApiModelProperty(value = "架构资产类型（架构视图、架构演进路线、业务活动资产等）")
+    private Byte archiAssetType;
+
+    @ApiModelProperty(value = "架构资产类型关联的ID，目前架构视图关联archi_view表")
+    private Long archiAssetTypeId;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    private Long lastUpdateMan;
+
+    @ApiModelProperty(value = "JSON综合字段；将架构元素的属性和值利用Json数据存储")
+    private String fieldsValue;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String column01;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String column02;
+
+    @ApiModelProperty(value = "旧版本ID")
+    private Long orignVersionId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否首页展示 0 展示   1  不展示")
+    private Byte isShow;
+
+    @ApiModelProperty(value = "原架构ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orignAssetId;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "资产常量,必传。")
+    @TableField(exist = false)
+    private String assetConstant;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetInfoDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 资产架构
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-09
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "资产架构", description = "资产架构传输对象")
+public class ArchiAssetInfoDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "总条数")
+    private Integer total;
+
+    @ApiModelProperty(value = "架构组件ID")
+    @TableId(value = "asset_id", type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+
+    @ApiModelProperty(value = "架构组件名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "资产编码，采用8位阶梯设计编码，通过编码识别层级")
+    private String assetCode;
+
+    @ApiModelProperty(value = "上级架构组件ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentAssetId;
+
+    @ApiModelProperty(value = "上级架构组件名称")
+    private String parentAssetName;
+
+    @ApiModelProperty(value = "父级编码")
+    private String parentCode;
+
+    @ApiModelProperty(value = "版本ID")
+    private Long versionId;
+
+    @ApiModelProperty(value = "架构元素Id")
+    private Long archiEleId;
+
+    @ApiModelProperty(value = "架构类型")
+    private String archiType;
+
+    @ApiModelProperty(value = "架构归属")
+    private Long archiBelongId;
+
+    @ApiModelProperty(value = "架构资产状态（字典中读取，1：现状态；2：目标态）")
+    private Integer archiAssetState;
+
+    @ApiModelProperty(value = "架构资产类型（架构视图、架构演进路线、业务活动资产等）,必传")
+    private Byte archiAssetType;
+
+    @ApiModelProperty(value = "架构阶段（1：总体架构；2：系统架构）,必传")
+    private Integer archiStage;
+
+    @ApiModelProperty(value = "架构资产类型关联的ID，目前架构视图关联archi_view表,必传")
+    private Long archiAssetTypeId;
+
+    @ApiModelProperty(value = "关联资产，实际用作兄弟关系连线，可支持多个target")
+    private List<JSONObject> targetAsset;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    private Long lastUpdateMan;
+
+    @ApiModelProperty(value = "JSON综合字段；将架构元素的属性和值利用Json数据存储")
+    private List<JSONObject> fieldsValue;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String column01;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String column02;
+
+    @ApiModelProperty(value = "组件类型名称")
+    private String eleName;
+
+    @ApiModelProperty(value = "旧版本ID")
+    private Long orignVersionId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否首页展示 0 展示   1  不展示")
+    private Byte isShow;
+
+    @ApiModelProperty(value = "原架构ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orignAssetId;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "资产常量,必传。")
+    @TableField (exist = false)
+    private String assetConstant;
+
+    @ApiModelProperty(value = "版本")
+    private String version;
+
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "元素id集合")
+    private List<Long> eleIdList;
+
+    @ApiModelProperty(value = "架构视图 ID")
+    @TableField (exist = false)
+    private Long archiViewId;
+
+    @ApiModelProperty(value = "承建类型:1统推，2自建")
+    @TableField("build_type")
+    private Integer buildType;
+
+    @ApiModelProperty(value = "来源:0系统资产，1总体资产，2概设关联业务管理同步更新")
+    private Integer isExtend;
+
+    @ApiModelProperty(value = "项目ID")
+    @TableField (exist = false)
+    private Long prjId;
+
+    @ApiModelProperty(value = "项目编码")
+    @TableField (exist = false)
+    private String prjCode;
+
+    @ApiModelProperty(value = "项目名称")
+    @TableField (exist = false)
+    private String prjName;
+
+    @ApiModelProperty(value = "系统ID")
+    @TableField (exist = false)
+    private Long appId;
+
+    @ApiModelProperty(value = "系统编码")
+    @TableField (exist = false)
+    private String appCode;
+
+    @ApiModelProperty(value = "系统名称")
+    @TableField (exist = false)
+    private String appName;
+
+    @ApiModelProperty(value = "资产id集合")
+    private List<Long> assetIdList;
+
+    @ApiModelProperty(value = "继承集合")
+    private List<ArchiAssetExtendDTO> extend;
+
+    @ApiModelProperty(value = "图标")
+    private String icon;
+
+    @ApiModelProperty(value = "图形名称")
+    private String iconName;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+
+    @ApiModelProperty(value = "图形库ID")
+    private Long graphId;
+
+    @ApiModelProperty(value = "上级元素名称")
+    private List<String> parentElement;
+
+    @ApiModelProperty(value = "资产编号")
+    private String assetNumber;
+    
+    @ApiModelProperty(value = "上级资产")
+    private List<String> parentAsset;
+
+    /**
+     * 限制
+     */
+    @ApiModelProperty(value = "限制")
+    private Long limit;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetNowDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 资产DTO
+ *
+ * @author admin
+ * @date 2024/02/21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "资产")
+public class ArchiAssetNowDTO extends BasePageEntity {
+
+    @ApiModelProperty("资产ID")
+    private Long assetId;
+
+    @ApiModelProperty(value = "资产名称")
+    private String assetName;
+
+    @ApiModelProperty("架构归属")
+    private String assertType;
+
+    @ApiModelProperty("架构归属ID")
+    private Long archiBelongId;
+    
+    @ApiModelProperty(value = "上级架构组件ID")
+    private Long parentAssetId;
+
+    @ApiModelProperty(value = "上级架构组件名称")
+    private String parentAssetName;
+    
+    @ApiModelProperty(value = "所属元素")
+    private String eleName;
+    
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+    
+    @ApiModelProperty(value = "架构阶段（1：总体架构；2：系统架构）,必传")
+    private Integer archiStage;
+    
+    @ApiModelProperty(value = "架构资产状态（字典中读取，1：现状态；2：目标态）")
+    private Integer archiAssetState;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetVisalDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "资产可视化面板请求参数")
+public class ArchiAssetVisalDTO {
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetsRelationDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设计态-架构关系
+ *
+ * @author makejava
+ * @since 2024-04-29 14:27:35
+ */
+@ApiModel(description = "设计态-架构关系")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class ArchiAssetsRelationDTO {
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("主键")
+    private Long relaId;
+
+    /**
+     * 架构组件ID
+     */
+    @ApiModelProperty("资产ID")
+    @NotNull(message = "资产ID不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+
+    /**
+     * 资产编码
+     */
+    @ApiModelProperty("资产编码")
+    private String assetCode;
+
+    /**
+     * 资产名称
+     */
+    @ApiModelProperty("资产名称")
+    private String assetName;
+
+    /**
+     * 关联资产ID
+     */
+    @ApiModelProperty("关联资产ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "关联资产ID不能为空")
+    private Long relaAssetId;
+
+    /**
+     * 关联资产编码
+     */
+    @ApiModelProperty("关联资产编码")
+    private String relaAssetCode;
+
+    /**
+     * 关联资产名称
+     */
+    @ApiModelProperty("关联资产名称")
+    private String relaAssetName;
+
+    /**
+     * 资产的父级节点串
+     */
+    @ApiModelProperty("资产的父级节点串")
+    // @NotBlank(message = "资产的父级节点串不能为空")
+    private String parentAssetIds;
+
+    /**
+     * 资产的父级节点名称
+     */
+    @ApiModelProperty("资产的父级节点名称")
+    // @NotBlank(message = "资产的父级节点名称不能为空")
+    private String parentAssetNames;
+
+    /**
+     * 元素关系ID
+     */
+    @ApiModelProperty("元素关系ID")
+    private Long eleRelaId;
+
+    /**
+     * 架构元素关系ID
+     */
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "架构元素关系ID不能为空")
+    private Long assetRelaId;
+
+    /**
+     * 状态 0:已停用 1:已发布 2:暂存
+     */
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    /**
+     * 图标ID
+     */
+    @ApiModelProperty(value = "图标ID")
+    @NotNull(message = "图标ID不能为空")
+    private String iconId;
+
+    @ApiModelProperty(value = "JSON综合字段；将架构元素的属性和值利用Json数据存储")
+    private String fieldsValue;
+}
+

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetsRelationQueryDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 设计态-架构关系
+ *
+ * @author makejava
+ * @since 2024-04-29 14:27:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(description = "设计态-架构关系")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class ArchiAssetsRelationQueryDTO extends BasePageEntity {
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号（主键）")
+    private Long relaId;
+
+    /**
+     * 资产名称
+     */
+    @ApiModelProperty("资产名称")
+    private String assetName;
+
+    /**
+     * 关联资产名称
+     */
+    @ApiModelProperty("关联资产名称")
+    private String relaAssetName;
+
+    /**
+     * 元素关系ID
+     */
+    @ApiModelProperty("元素关系ID")
+    private Long eleRelaId;
+
+    /**
+     * 元素关系名称
+     */
+    @ApiModelProperty("元素关系名称")
+    private String rcName;
+
+    /**
+     * 状态 0:已停用 1:已发布 2:暂存
+     */
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    /**
+     * 元素关系 ID
+     */
+    @ApiModelProperty(value = "元素关系 ID")
+    private Long assetRelaId;
+}
+

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiCommonDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+@Data
+public class ArchiCommonDTO {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+    private String assetName;
+
+    private String assetCode;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentAssetId;
+
+    private String parentAssetName;
+
+    private String parentCode;
+
+    /**
+     * JSON字段
+     */
+    private Object fieldsValue;
+
+
+}

arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElePropertyDTO.java → arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiElePropertyDTO.java

-package org.arch.modules.archoverall.dto;
+package org.arch.common.archoverall.dto;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiEleRelaConstrainDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 元素关系的约束条件
+ */
+@ApiModel(description = "元素关系的约束条件")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArchiEleRelaConstrainDTO {
+
+    /**
+     * 对象1
+     */
+    @ApiModelProperty(value = "对象1", required = true)
+    private Long eleGtId;
+
+    /**
+     * 对象2
+     */
+    @ApiModelProperty(value = "对象2", required = true)
+    private Long eleLtId;
+
+    /**
+     * 适用范围
+     */
+    @ApiModelProperty(value = "适用范围 1:业务架构 2:应用架构 3:数据架构 4:技术架构 5:安全架构 0:架构之间", required = true)
+    private Integer scope;
+
+    /**
+     * 对象名称1
+     */
+    @ApiModelProperty(value = "对象名称1")
+    private String eleGtName;
+
+    /**
+     * 对象名称2
+     */
+    @ApiModelProperty(value = "对象名称2")
+    private String eleLtName;
+
+}
\ No newline at end of file

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiEleRelaDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "元素关系模块查询的传输对象", description = "元素关系模块查询的传输对象")
+public class ArchiEleRelaDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "主键")
+    private Long eleRelaId;
+
+    @ApiModelProperty(value = "元素关系名称")
+    private String rsName;
+
+    @ApiModelProperty(value = "适用范围")
+    private String scope;
+
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "元素关系id集合")
+    private List<Long> eleRelaIdList;
+}

arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElementDTO.java → arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiElementDTO.java

-package org.arch.modules.archoverall.dto;
+package org.arch.common.archoverall.dto;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiMetaModelDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "元模型查询的传输对象", description = "元模型查询的传输对象")
+public class ArchiMetaModelDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "总条数")
+    private Integer total;
+
+    @ApiModelProperty(value = "主键")
+    private Long metaModelId;
+
+    @ApiModelProperty(value = "版本信息")
+    private String version;
+
+    @ApiModelProperty(value = "版本名称")
+    private String verName;
+
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    private Integer delFlag;
+
+    /**
+     * 元模式数据
+     */
+    @ApiModelProperty(value = "元模型数据")
+    private String metaModelData;
+
+    /**
+     * 元模型 SVG
+     */
+    @ApiModelProperty(value = "元模型 SVG")
+    private String metaModelSvg;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiRelaSatePostDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 资产关系 发布/停用
+ * </p>
+ *
+ * @author admin
+ * @date 2024/02/22
+ * @since 2024-02-22
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(value = "资产关系", description = "资产关系")
+public class ArchiRelaSatePostDTO {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "主键不能为空")
+    private Long relaId;
+
+    @ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存")
+    @NotNull(message = "状态不能为空")
+    private Byte state;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiTreeDto.java

+package org.arch.common.archoverall.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 应用架构
+ * </p>
+ *
+ * @author
+ * @since 2020-08-29
+ */
+@Data
+@ApiModel("架构对象")
+public class ArchiTreeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 架构组件ID
+     */
+    @ApiModelProperty("架构组件ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+
+    /**
+     * 架构组件名称
+     */
+    @ApiModelProperty("架构组件名称")
+    private String assetName;
+
+
+    @ApiModelProperty("组件编码")
+    private String assetCode;
+
+//    /**
+//     * 架构组件类型
+//     */
+//    @ApiModelProperty("架构组件类型")
+//    private String moduleTypeId;
+    /**
+     * 上级架构组件ID
+     */
+    @ApiModelProperty("上级架构组件ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentAssetId;
+
+    @ApiModelProperty("父级名称")
+    private String parentAssetName;
+
+    @ApiModelProperty("父级编码")
+    private String parentCode;
+
+    /**
+     * 是否有下级，大于0代表有，小于等于0代表没有
+     */
+    @ApiModelProperty("是否有下级，大于0代表有，小于等于0代表没有")
+    private int haveChildren;
+
+    /**
+     * 子集
+     */
+    @ApiModelProperty("子集")
+    private List<ArchiTreeDto> children;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiViewDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.arch.enums.ArchiPrjReviewEnum;
+
+/**
+ * <p>
+ * 架构视图配置
+ * </p>
+ *
+ * @author lizhen
+ * @since 2023-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ArchiViewDTO", description = "架构视图配置DTO")
+public class ArchiViewDTO {
+
+    @ApiModelProperty(value = "审查类型")
+    private ArchiPrjReviewEnum reviewEnum;
+
+    @ApiModelProperty(value = "架构归属 1 业务架构 2 应用架构 3 数据架构 4 技术架构 5 安全架构")
+    private Integer archiBelongId;
+
+    @ApiModelProperty(value = "项目ID")
+    private Long prjId;
+
+    @ApiModelProperty(value = "系统ID")
+    private Long appId;
+
+    @ApiModelProperty(value = "架构阶段（1：总体架构；2：系统架构 3：概设架构 4：其他架构）")
+    private Integer archiStage;
+
+    @ApiModelProperty(value = "业务资料类型")
+    private String busiFileName;
+}

arch-base/src/main/java/org/arch/modules/archoverall/dto/BasePageEntity.java → arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BasePageEntity.java

-package org.arch.modules.archoverall.dto;
+package org.arch.common.archoverall.dto;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BatchRemoveDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 批量删除
+ *
+ * @author makejava
+ * @since 2023-12-14
+ */
+@ApiModel(description = "批量删除")
+@Data
+public class BatchRemoveDTO implements Serializable {
+
+    /**
+     * 钥匙
+     */
+    @ApiModelProperty("主键集合")
+    @NotEmpty(message = "请至少选择一条记录")
+    private List<Long> ids;
+}

arch-base/src/main/java/org/arch/modules/archoverall/dto/BatchUpdateDTO.java → arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BatchUpdateDTO.java

-package org.arch.modules.archoverall.dto;
+package org.arch.common.archoverall.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BatchUpdateRelaDTO.java

+package org.arch.common.archoverall.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 批量更新 DTO
+ *
+ * @author xh13k
+ * @date 2024/06/04
+ */
+@Data
+public class BatchUpdateRelaDTO {
+
+    private List<Long> eleRelaId;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/DelDTO.java

+package org.arch.common.archoverall.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DelDTO {
+    List<Long> assetId;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/DocMarkTag.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "word文档书签", description = "word文档书签标识")
+public class DocMarkTag {
+
+    @ApiModelProperty(value = "书签标题开始位置")
+    private String startTilteBookmark;
+
+    @ApiModelProperty(value = "书签标题结束位置")
+    private String endTilteBookmark;
+
+    @ApiModelProperty(value = "书签正文开始位置")
+    private String startContentBookmark;
+
+    @ApiModelProperty(value = "书签正文结束位置")
+    private String endContentBookmark;
+
+    @ApiModelProperty(value = "表格书签")
+    private String tableBookmark;
+
+    @ApiModelProperty(value = "图片书签")
+    private String picBookmark;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/NeedInfoDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.arch.enums.ArchiPrjReviewEnum;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 需求管理信息
+ * </p>
+ *
+ * @author java
+ * @since 2024-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "NeedInfo对象", description = "需求管理信息")
+public class NeedInfoDTO extends BasePageEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "需求ID")
+    @TableId(value = "need_id", type = IdType.AUTO)
+    private Long needId;
+
+    @ApiModelProperty(value = "需求编码")
+    @TableField("need_code")
+    private String needCode;
+
+    @ApiModelProperty(value = "需求名称")
+    @TableField("need_name")
+    private String needName;
+
+    @ApiModelProperty(value = "批次计划ID")
+    @TableField("bat_plan_id")
+    private Long batPlanId;
+
+    @ApiModelProperty(value = "批次计划编码")
+    @TableField("bat_plan_code")
+    private String batPlanCode;
+
+    @ApiModelProperty(value = "批次名称")
+    @TableField("bat_name")
+    private String batName;
+
+    @ApiModelProperty(value = "组织机构ID")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "组织机构编码")
+    @TableField("org_code")
+    private String orgCode;
+
+    @ApiModelProperty(value = "组织机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "年度")
+    @TableField("year")
+    private String year;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty(value = "审批状态：1新建、2审批中、3审批通过、4驳回")
+    @TableField("approve_state")
+    private Long approveState;
+
+    @ApiModelProperty(value = "所需材料JSON附件")
+    @TableField("files_value")
+    private List<JSONObject> filesValue;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_man")
+    private Long createMan;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    @TableField("del_flag")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @TableField("last_update_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    @TableField("last_update_man")
+    private Long lastUpdateMan; 
+    
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+    
+    @ApiModelProperty(value = "项目ID")
+    @TableField("prj_id")
+    private Long prjId;
+
+    @ApiModelProperty(value = "项目编码")
+    @TableField("prj_code")
+    private String prjCode;
+
+    @ApiModelProperty(value = "项目名称")
+    @TableField("prj_name")
+    private String prjName;
+    
+    @ApiModelProperty(value = "需求类型：1需求发布、2需求确认。必传")
+    @TableField("need_type")
+    private Long needType;
+    
+    @ApiModelProperty(value = "承建类型")
+    @TableField("build_type")
+    private Long buildType;
+    
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+    
+    @ApiModelProperty(value = "审查类型")
+    private ArchiPrjReviewEnum reviewEnum;
+    
+    @ApiModelProperty(value = "需求IDList")
+    private List<Long> needIdList;
+    
+    @ApiModelProperty(value = "材料List")
+    private List<String> fileList;
+    
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/OnlineReviewCountQueryDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "OnlineReviewCountQueryDTO对象", description = "概设材料统计分析查询对象")
+public class OnlineReviewCountQueryDTO extends BasePageEntity {
+	@ApiModelProperty(value = "年度")
+    private String year;
+	
+	@ApiModelProperty(value = "统计类型:1单位概设统计  2批次系统统计")
+    private Integer countType;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/OnlineReviewWriteDTO.java

+package org.arch.common.archoverall.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 概设材料在线意见编制
+ * </p>
+ *
+ * @author java
+ * @since 2024-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "OnlineReviewWrite对象", description = "概设材料在线意见编制")
+public class OnlineReviewWriteDTO extends BasePageEntity {
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "idea_id", type = IdType.AUTO)
+    private Long ideaId;
+
+    @ApiModelProperty(value = "意见编码")
+    @TableField("idea_code")
+    private String ideaCode;
+
+    @ApiModelProperty(value = "概设材料在线意见编制sheet（1：概设材料修改，2：意见生成与流转）")
+    @TableField("idea_type")
+    private Long ideaType;
+
+    @ApiModelProperty(value = "年度")
+    @TableField("year")
+    private String year;
+
+    @ApiModelProperty(value = "批次计划")
+    @TableField("bat_plan_id")
+    private Long batPlanId;
+
+    @ApiModelProperty(value = "批次名称")
+    @TableField("bat_name")
+    private String batName;
+
+    @ApiModelProperty(value = "需求Id")
+    @TableField("need_id")
+    private Long needId;
+
+    @ApiModelProperty(value = "需求名称")
+    @TableField("need_name")
+    private String needName;
+
+    @ApiModelProperty(value = "项目Id")
+    @TableField("prj_id")
+    private Long prjId;
+
+    @ApiModelProperty(value = "项目名称")
+    @TableField("prj_name")
+    private String prjName;
+
+    @ApiModelProperty(value = "关联机构Id")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "关联机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "评审材料名称")
+    @TableField("require_name")
+    private String requireName;
+
+    @ApiModelProperty(value = "附件ID")
+    @TableField("file_id")
+    private Long fileId;
+
+    @ApiModelProperty(value = "附件URL")
+    @TableField("file_url")
+    private String fileUrl;
+
+    @ApiModelProperty(value = "推送状态")
+    @TableField("push_state")
+    private Long pushState;
+
+    @ApiModelProperty(value = "发送状态")
+    @TableField("send_state")
+    private Long sendState;
+
+    @ApiModelProperty(value = "剩余时间")
+    @TableField("excess_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String excessTime;
+
+    @ApiModelProperty(value = "评审意见")
+    @TableField("review_suggestion")
+    private String reviewSuggestion;
+
+    @ApiModelProperty(value = "在线评审状态(1:通过 0:未通过 2:待评审)")
+    @TableField("online_review_state")
+    private Integer onlineReviewState;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_man")
+    private Integer createMan;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "最后更新人")
+    @TableField("last_update_man")
+    private Integer lastUpdateMan;
+
+    @ApiModelProperty(value = "最后更新时间")
+    @TableField("last_update_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    @TableField("del_flag")
+    private Integer delFlag;
+    
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/WordContentDTO.java

+package org.arch.common.archoverall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.enums.ArchiPrjReviewEnum;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 获取word片段内容
+ * </p>
+ *
+ * @author java
+ * @since 2024-02-27
+ */
+@Data
+@ApiModel(value = "WordContentDTO对象", description = "word片段内容")
+public class WordContentDTO {
+
+    @ApiModelProperty(value = "项目Id")
+    private Long prjId;
+
+    @ApiModelProperty(value = "需求Id")
+    private Long needId;
+
+    @ApiModelProperty(value = "审查类型")
+    private ArchiPrjReviewEnum reviewEnum;
+
+    @ApiModelProperty(value = "业务资料类型")
+    private String busiFileName;
+
+    @ApiModelProperty(value = "备注")
+    private String comment;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyWord;
+    /**
+     * 字典表中配置（type=check_range）
+     */
+    @ApiModelProperty(value = "检查范围")
+    private String checkRange;
+
+    @ApiModelProperty(value = "检查范围")
+    private List<String> checkRanges;
+
+    @ApiModelProperty(value = "类型，区分导出类型")
+    private String type;
+
+    /**
+     * 书签集合
+     */
+    @ApiModelProperty(value = "标签范围")
+    private List<DocMarkTag> docMarkTag;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchVisualVO.java

+package org.arch.common.archoverall.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArchVisualVO implements Serializable {
+    //资产类型(
+    //五大架构：
+    //ARCHI_TECHNOLOGY：技术架构
+    //ARCHI_APPLICATION：应用架构
+    //ARCHI_BUSINESS：业务架构
+    //ARCHI_SAFE：安全架构
+    //ARCHI_DATA：数据架构
+    //)
+    private String archType;
+    //父类资产id
+    private String parentAssetId;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAbilityAssetsRelationQueryVO.java

+package org.arch.common.archoverall.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 中台服务清单关联资产（资产关联，中台架构服务，其他四大架构资产）(ArchiAbilityAssetsRelation)实体类
+ *
+ * @author makejava
+ * @since 2024-04-29 14:27:35
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "archiAbilityAssetsRelation", description = "中台服务清单关联资产")
+public class ArchiAbilityAssetsRelationQueryVO {
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号（主键）")
+    private Long relaId;
+    /**
+     * 资产Id
+     */
+    @ApiModelProperty(value = "服务清单Id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+    /**
+     * 资产编码
+     */
+    @ApiModelProperty(value = "服务编码")
+    private String assetCode;
+
+    @ApiModelProperty(value = "服务名称")
+    private String assetName;
+    /**
+     * 关联资产ID
+     */
+    @ApiModelProperty(value = "资产ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long relaAssetId;
+    /**
+     * 关联资产编码
+     */
+    @ApiModelProperty(value = "关联资产编码")
+    private String relaAssetCode;
+
+    /**
+     * 关联资产名称
+     */
+    @ApiModelProperty(value = "关联资产名称")
+    private String relaAssetName;
+    /**
+     * 架构类型Id
+     */
+    @ApiModelProperty(value = "架构类型Id")
+    private Integer archiTypeId;
+    /**
+     * 架构类型名称（业务架构、应用架构、数据架构、技术架构、安全架构）
+     */
+    @ApiModelProperty(value = "架构类型名称 1业务架构、2应用架构、3数据架构、4技术架构、5安全架构")
+    private String archiType;
+    /**
+     * 版本ID
+     */
+    @ApiModelProperty(value = "版本ID")
+    private Integer versionId;
+    /**
+     * 视图ID
+     */
+    @ApiModelProperty(value = "视图ID")
+    private Long viewId;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private Long creator;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private Long updateby;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+    /**
+     * 删除标记（0：未删除；1：已删除）
+     */
+    @ApiModelProperty(value = "删除标记（0：未删除；1：已删除）")
+    private Integer delFlag;
+    /**
+     * 元素名称
+     */
+    @ApiModelProperty(value = "元素名称")
+    private String eleName;
+    /**
+     * 资产的父级节点串
+     */
+    @ApiModelProperty(value = "资产的父级节点串")
+    private String parentAssetIds;
+    /**
+     * 资产的父级节点名称
+     */
+    @ApiModelProperty(value = "资产的父级节点名称串")
+    private String parentAssetNames;
+
+    /**
+     * 元素关系ID
+     */
+    @ApiModelProperty("元素关系ID")
+    private Long eleRelaId;
+
+    /**
+     * 元素关系名称
+     */
+    @ApiModelProperty("元素关系名称")
+    private String rsName;
+
+    /**
+     * 状态 0:已停用 1:已发布 2:暂存
+     */
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    /**
+     * 图标ID
+     */
+    @ApiModelProperty(value = "图标ID")
+    private String iconId;
+}
+

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAssetEleRelaVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.arch.common.BaseEntity;
+
+/**
+ * 架构资产关系
+ */
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(description = "架构资产关系")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArchiAssetEleRelaVO extends BaseEntity {
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Long assetRelaId;
+
+    /**
+     * 资产关系名称
+     */
+    @ApiModelProperty(value = "资产关系名称")
+    private String rsName;
+
+    /**
+     * 元素 ID
+     */
+    @ApiModelProperty(value = "元素 ID")
+    private Long eleId;
+
+    /**
+     * 元素编码
+     */
+    @ApiModelProperty(value = "元素编码")
+    private String eleCode;
+
+    /**
+     * 元素名称
+     */
+    @ApiModelProperty(value = "元素名称")
+    private String eleName;
+
+    /**
+     * 关联元素 ID
+     */
+    @ApiModelProperty(value = "关联元素 ID")
+    private Long relaEleId;
+
+    /**
+     * 关联元素编码
+     */
+    @ApiModelProperty(value = "关联元素编码")
+    private String relaEleCode;
+
+    /**
+     * 关联元素名称
+     */
+    @ApiModelProperty(value = "关联元素名称")
+    private String relaEleName;
+
+    /**
+     * 是否跨架构（1：是 0：否）
+     */
+    @ApiModelProperty(value = "是否跨架构（1：是 0：否）")
+    private Byte across;
+
+    /**
+     * 图标ID
+     */
+    @ApiModelProperty(value = "图标ID")
+    private String iconId;
+
+    /**
+     * 遵从元素关系，元素关系 ID
+     */
+    @ApiModelProperty(value = "遵从元素关系，元素关系 ID")
+    private Long eleRelaId;
+
+    /**
+     * 遵从元素关系，元素关系名称
+     */
+    @ApiModelProperty(value = "遵从元素关系，元素关系名称")
+    private String eleRelaName;
+}
\ No newline at end of file

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAssetVO.java

+package org.arch.common.archoverall.vo;
+
+import cn.hutool.core.lang.tree.Tree;
+import com.alibaba.fastjson2.JSONArray;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 架构资产
+ *
+ * @author makejava
+ * @since 2023-12-22
+ */
+@ApiModel(description = "架构资产VO")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class ArchiAssetVO {
+
+    /**
+     * 架构元素ID
+     */
+    private Long archiEleId;
+
+    /**
+     * 架构元素名称
+     */
+    private String eleName;
+
+    @ApiModelProperty("资产ID")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long assetId;
+
+    @ApiModelProperty("code")
+    private String assetCode;
+
+    @ApiModelProperty("资产名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "上级架构组件ID")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long parentAssetId;
+
+    @ApiModelProperty(value = "上级架构组件名称")
+    private String parentAssetName;
+
+    @ApiModelProperty("版本ID")
+    private Long versionId;
+
+    @ApiModelProperty(value = "图形名称")
+    private String iconName;
+
+    @ApiModelProperty(value = "图形颜色")
+    private String color;
+
+    @ApiModelProperty(value = "图形类型")
+    private String eleType;
+
+    @ApiModelProperty(value = "图标")
+    private String icon;
+
+    @ApiModelProperty(value = "架构归属")
+    private Integer archiBelongId;
+
+    @ApiModelProperty("架构类型")
+    private String archiType;
+
+    @ApiModelProperty("目标资产")
+    private JSONArray targetAssert;
+
+    @ApiModelProperty("子列表")
+    private List<ArchiAssetVO> subList;
+
+    @ApiModelProperty("目标列表")
+    private List<ArchiAssetVO> targetList;
+
+    @ApiModelProperty("子集")
+    private List<Tree<String>> children;
+
+    @ApiModelProperty("元素ID")
+    private Long elementId;
+
+    @ApiModelProperty("元素名称")
+    private String elementName;
+
+    @ApiModelProperty(value = "资产编号")
+    private String assetNumber;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAssetViewVO.java

+package org.arch.common.archoverall.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 架构资产可视化
+ *
+ * @author makejava
+ * @since 2023-12-22
+ */
+@ApiModel(description = "架构资产可视化VO")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class ArchiAssetViewVO {
+
+    @ApiModelProperty("资产ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long assetId;
+
+    @ApiModelProperty("code")
+    private String assetCode;
+
+    @ApiModelProperty("资产名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "架构归属")
+    private Integer archiBelongId;
+
+    @ApiModelProperty(value = "上级架构组件ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentAssetId;
+
+    @ApiModelProperty("子列表")
+    private List<ArchiAssetViewVO> subList;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiEleRelaNameVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ArchiElement", description = "架构元素关系")
+public class ArchiEleRelaNameVO {
+
+    @ApiModelProperty(value = "主键")
+    private Long eleRelaId;
+
+    @ApiModelProperty(value = "元素关系名称")
+    private String rsName;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiEleRelaVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ArchiElement", description = "架构元素关系")
+public class ArchiEleRelaVO {
+
+    @ApiModelProperty(value = "主键")
+    private Long eleRelaId;
+
+    @ApiModelProperty(value = "元素关系名称")
+    private String eleRelaName;
+
+    @ApiModelProperty(value = "主键")
+    private Long sourceElementId;
+
+    @ApiModelProperty(value = "元素名称")
+    private String sourceElementName;
+
+    @ApiModelProperty(value = "元素类型（1：标准图元；2：常规图元）")
+    private Integer sourceEleType;
+
+    @ApiModelProperty(value = "图标")
+    private String sourceIcon;
+
+    @ApiModelProperty(value = "图形名称")
+    private String sourceIconName;
+
+    @ApiModelProperty(value = "颜色")
+    private String sourceColor;
+
+    @ApiModelProperty(value = "主键")
+    private Long targetElementId;
+
+    @ApiModelProperty(value = "元素名称")
+    private String targetElementName;
+
+    @ApiModelProperty(value = "元素类型（1：标准图元；2：常规图元）")
+    private Integer targetEleType;
+
+    @ApiModelProperty(value = "图标")
+    private String targetIcon;
+
+    @ApiModelProperty(value = "图形名称")
+    private String targetIconName;
+
+    @ApiModelProperty(value = "颜色")
+    private String targetColor;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiVersionVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 架构资产版本
+ * </p>
+ *
+ * @author xh
+ * @since 2023-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ArchiView", description = "架构资产版本")
+public class ArchiVersionVO {
+
+    @ApiModelProperty(value = "版本名称")
+    private String versionName;
+
+    @ApiModelProperty(value = "版本ID")
+    private Long versionId;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiViewVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目架构视图
+ * </p>
+ *
+ * @author xh
+ * @since 2023-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ArchiView", description = "项目架构视图")
+public class ArchiViewVO {
+
+    @ApiModelProperty(value = "视图详情 ID")
+    private Long viewDetailsId;
+
+    @ApiModelProperty(value = "视图详情名称")
+    private String viewDetailName;
+
+    @ApiModelProperty(value = "视图 ID")
+    private Long viewId;
+
+    @ApiModelProperty(value = "视图名称")
+    private String viewName;
+
+    @ApiModelProperty(value = "画布缩略图")
+    private String metaModelSvg;
+
+    @ApiModelProperty(value = "画布信息")
+    private String metaModelData;
+}

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/MxCellTreeVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Mx元素Tree
+ *
+ * @author MxCell
+ * @date 2023/12/07
+ */
+@ApiModel(description = "Mx元素Tree")
+@Data
+public class MxCellTreeVO {
+
+    /**
+     * 元素ID
+     */
+    @ApiModelProperty(value = "元素ID", position = 1)
+    private String id;
+
+    /**
+     * 元素名称
+     */
+    @ApiModelProperty(value = "元素名称", position = 2)
+    private Object topic;
+
+    /**
+     * 方向
+     */
+    @ApiModelProperty(value = "方向", position = 3)
+    private String direction;
+
+    /**
+     * 展开
+     */
+    @ApiModelProperty(value = "展开", position = 3)
+    private Boolean expanded;
+
+    private List<MxCellTreeVO> children;
+}
\ No newline at end of file

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/MxCellVO.java

+package org.arch.common.archoverall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Mx元素
+ *
+ * @author MxCell
+ * @date 2023/12/07
+ */
+@ApiModel(description = "Mx元素")
+@Data
+public class MxCellVO {
+
+    /**
+     * 元素ID
+     */
+    @ApiModelProperty(value = "元素ID", position = 1)
+    private String sourceId;
+
+    /**
+     * 元素名称
+     */
+    @ApiModelProperty(value = "元素名称", position = 2)
+    private Object source;
+
+    /**
+     * 关联元素ID
+     */
+    @ApiModelProperty(value = "关联元素ID", position = 4)
+    private String targetId;
+
+    /**
+     * 关联元素名称
+     */
+    @ApiModelProperty(value = "关联元素名称", position = 3)
+    private Object target;
+
+    /**
+     * 关联关系名称
+     */
+    @ApiModelProperty(value = "关联关系名称", position = 5)
+    private Object linkName;
+
+    /**
+     * 关联关系描述
+     */
+    @ApiModelProperty(value = "关联关系描述", position = 6)
+    private Object linkNameDesc;
+
+    /**
+     * 方向
+     */
+    @ApiModelProperty(value = "方向", position = 7)
+    private String direction;
+
+    private Integer sort;
+}
\ No newline at end of file

arch-base/src/main/java/org/arch/modules/base/dto/UpLoadDTO.java → arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/MxFileVO.java

-package org.arch.modules.base.dto;
+package org.arch.common.archoverall.vo;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-/**
- * oss对象存储
- *
- * @author admin
- * @date 2023/12/05
- */
-@ApiModel(description = "oss对象存储DTO")
+@ApiModel(description = "drawio上传VO")
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor
-public class UpLoadDTO {
+@Builder
+public class MxFileVO {
 
 
     /**
     /**
-     * 文件 ID
+     * id
      */
      */
-    @ApiModelProperty(value = "文件ID")
-    private Long fileId;
+    @ApiModelProperty(hidden = true)
+    private Long id;
 
 
     /**
     /**
-     * 地址
+     * xml标题
      */
      */
-    @ApiModelProperty(value = "地址")
-    private String url;
+    @ApiModelProperty(value = "xml标题", position = 2)
+    private String title;
+
+    /**
+     * xml内容
+     */
+    @ApiModelProperty(value = "xml内容；加密或者解密具体看：https://jgraph.github.io/drawio-tools/tools/convert.html?", position = 3)
+    private String content;
 
 
 }
 }

arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/NeedReviewVo.java

+package org.arch.common.archoverall.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 需求管理信息
+ * </p>
+ *
+ * @author java
+ * @since 2024-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "NeedReviewVo对象", description = "需求评审信息")
+public class NeedReviewVo implements Serializable {
+
+    @ApiModelProperty(value = "需求ID")
+    private Long needId;
+
+    @ApiModelProperty(value = "需求编码")
+    @TableField("need_code")
+    private String needCode;
+
+    @ApiModelProperty(value = "需求名称")
+    @TableField("need_name")
+    private String needName;
+
+    @ApiModelProperty(value = "批次计划ID")
+    @TableField("bat_plan_id")
+    private Long batPlanId;
+
+    @ApiModelProperty(value = "批次计划编码")
+    @TableField("bat_plan_code")
+    private String batPlanCode;
+
+    @ApiModelProperty(value = "批次名称")
+    @TableField("bat_name")
+    private String batName;
+
+    @ApiModelProperty(value = "组织机构ID")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "组织机构编码")
+    @TableField("org_code")
+    private String orgCode;
+
+    @ApiModelProperty(value = "组织机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "年度")
+    @TableField("year")
+    private String year;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty(value = "评审状态：1新建、2审批中、3审批通过、4驳回")
+    private Long approveState;
+
+    @ApiModelProperty(value = "所需材料JSON附件")
+    @TableField("files_value")
+    private String filesValue;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_man")
+    private Long createMan;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    @TableField("del_flag")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    @TableField("last_update_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    @TableField("last_update_man")
+    private Long lastUpdateMan;
+    
+    @ApiModelProperty(value = "项目ID")
+    @TableField("prj_id")
+    private Long prjId;
+
+    @ApiModelProperty(value = "项目编码")
+    @TableField("prj_code")
+    private String prjCode;
+
+    @ApiModelProperty(value = "项目名称")
+    @TableField("prj_name")
+    private String prjName;
+    
+    @ApiModelProperty(value = "需求类型：1需求发布、2需求确认。必传")
+    @TableField("need_type")
+    private Long needType;
+    
+    @ApiModelProperty(value = "承建类型")
+    @TableField("build_type")
+    private Long buildType;
+    
+    @ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+    
+    @ApiModelProperty(value = "主键")
+    private Long reviewId;
+
+    @ApiModelProperty(value = "评审材料类型（1：需求评审；2：概设评审）")
+    private String reviewType;
+
+    @ApiModelProperty(value = "评审材料关联主键（1：关联需求，2：关联概设）")
+    private Long busiTypeId;
+    
+    @ApiModelProperty(value = "评审意见")
+    private String reviewSuggestion;
+
+    @ApiModelProperty(value = "评审状态(1:通过 0:未通过)")
+    private Integer reviewState;
+
+}