[add]mybatis插件

framework-asset/src/main/java/org/arch/overall/controller/ArchiEleDicyController.java

+package org.arch.overall.controller;
+
+import cn.hutool.core.lang.UUID;
+
+import io.swagger.annotations.ApiOperation;
+import org.arch.base.Result;
+import org.arch.base.utils.VersionUtil;
+import org.arch.common.modules.archoverall.dto.ArchiEleDicyDTO;
+import org.arch.common.modules.archoverall.entity.ArchiEleDicy;
+import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
+import org.arch.log.annotation.OperLog;
+import org.arch.log.logenum.LogOperTypeEnum;
+import org.arch.log.logenum.LogTypeEnum;
+import org.arch.overall.service.ArchiEleDicyService;
+import org.arch.overall.service.ArchiElePropertyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping("ma-ml-dicy")
+public class ArchiEleDicyController {
+    @Autowired
+    private ArchiEleDicyService archiEleDicyService;
+    @Autowired
+    private ArchiElePropertyService archiElePropertyService;
+
+    /**
+     * 新增字典数据属性
+     *
+     * @param params
+     * @param request 请求
+     * @return {@link R}
+     */
+    @PostMapping("/add-dicy-proy")
+    @ApiOperation(value = "新增字典数据属性", notes = "新增字典数据属性")
+    //@AutoLog(value = LogEventTypeEnum.INSERT, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "新增字典数据属性")
+    @OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "新增", moduleName = "字典数据属性")
+    public Result<Object> adArchiEleProperty(@RequestBody ArchiEleProperty archiEleProperty) {
+        if (archiEleProperty.getType() == null) {
+            return Result.error("字典数据属性类型不能为空！");
+        } else if (archiEleProperty.getTypeId() == null) {
+            return Result.error("字典数据属性类型id不能为空！");
+        } else {
+            archiEleProperty.setCreateTime(new Date());
+            archiEleProperty.setDelFlag(0);
+            if (archiEleProperty.getFieldName().length() > 50) {
+                return Result.error("字段名太长请修改为50个字符以内再提交！");
+            } else if (archiEleProperty.getCnName().length() > 50) {
+                return Result.error("中文名太长请修改为50个字符以内再提交！");
+            }
+            archiElePropertyService.save(archiEleProperty);
+        }
+        return Result.success();
+    }
+
+    /**
+     * 修改字典数据属性
+     *
+     * @param params
+     * @param request 请求
+     * @return {@link R}
+     */
+    @PostMapping(value = "/upd-dicy-proy")
+    @ApiOperation(value = "修改字典数据属性", notes = "修改字典数据属性")
+    //@AutoLog(value = LogEventTypeEnum.UPDATE, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "修改字典数据属性")
+    @OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "修改", moduleName = "字典数据属性")
+    public Result<Object> updateArchiEleProperty(@RequestBody ArchiEleProperty archiEleProperty) {
+        if (archiEleProperty.getPropertyId() == null) {
+            return Result.error("修改字典数据属性主键不能为空！");
+        }
+        archiElePropertyService.updateById(archiEleProperty);
+//	if(archiEleProperty.getState() == 1) {
+//		ArchiEleDicy ynMolDicys = new ArchiEleDicy();
+//		String str = archiEleProperty.getVersion();
+//		String ver = VersionUtil.getNextVersion(str);
+//		ynMolDicys.setVersion(ver);
+//		archiEleDicyService.updateById(ynMolDicys);
+//	}
+
+        return Result.success();
+    }
+
+    /**
+     * 删除字典数据属性
+     *
+     * @param params
+     * @param request 请求
+     * @return {@link R}
+     */
+    @PostMapping(value = "/del-proy")
+    @ApiOperation(value = "根据Id删除属性", notes = "根据Id删除属性")
+    //@AutoLog(value = LogEventTypeEnum.DELETE, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "删除字典数据属性")
+    @OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "根据Id删除属性", moduleName = "字典数据属性")
+    public Result<Object> delArchiEleProperty(@RequestBody ArchiEleProperty archiEleProperty) {
+        archiEleProperty.setDelFlag(1);
+        archiElePropertyService.updateById(archiEleProperty);
+        return Result.success();
+    }
+
+    /**
+     * 查询字典数据属性
+     *
+     * @param params
+     * @param request 请求
+     * @return {@link R}
+     */
+    @PostMapping(value = "/proy-list")
+    @ApiOperation(value = "查询字典数据属性", notes = "查询字典数据属性")
+    //@AutoLog(value = LogEventTypeEnum.SEARCH, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "查询字典数据属性")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "查询字典数据属性", moduleName = "字典数据属性")
+    public Result<List<ArchiEleProperty>> gtArchiElePropertyList(@RequestBody ArchiEleProperty archiEleProperty) {
+        List<ArchiEleProperty> list = archiElePropertyService.gtArchiElePropertyList(archiEleProperty);
+        return Result.success(list);
+    }
+
+    /**
+     * 新增字典
+     *
+     * @param params
+     * @param request 请求
+     * @return {@link R}
+     */
+    @PostMapping("/add")
+    @ApiOperation(value = "新增字典数据", notes = "新增字典数据")
+    //@AutoLog(value = LogEventTypeEnum.INSERT, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "新增字典数据")
+    @OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "新增字典数据", moduleName = "字典数据属性")
+    public Result<Object> adArchiEleDicy(@RequestBody ArchiEleDicy archiEleDicy) {
+        archiEleDicy.setDicyCode(UUID.fastUUID().toString());
+        archiEleDicy.setCreateTime(new Date());
+        List<ArchiEleDicy> list = new ArrayList<>();
+        list = archiEleDicyService.selectVer();
+        for (int i = 0; i < list.size(); i++) {
+            if (list.get(0).toString() != null) {
+                archiEleDicy.setVersion(list.get(i).getVersion());
+            }
+        }
+        archiEleDicy.setDelFlag(0);
+        archiEleDicyService.save(archiEleDicy);
+        return Result.success();
+    }
+
+    /**
+     * 修改字典数据
+     *
+     * @param params
+     * @param request 请求
+     * @return {@link R}
+     */
+    @PostMapping(value = "/upd")
+    @ApiOperation(value = "修改字典数据", notes = "修改字典数据")
+   // @AutoLog(value = LogEventTypeEnum.UPDATE, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "修改字典数据")
+    @OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "修改字典数据", moduleName = "字典数据属性")
+    public Result<Object> updateArchiEleDicy(@RequestBody ArchiEleDicy archiEleDicy) {
+        if (archiEleDicy.getDicyId() == null) {
+            return Result.error("修改字典数据主键不能为空！");
+        } else if (archiEleDicy.getState() == 1 && archiEleDicy.getVersion() == null) {
+            List<ArchiEleDicy> verlist = new ArrayList<>();
+            verlist = archiEleDicyService.selectVer();
+            for (int i = 0; i < verlist.size(); i++) {
+                if (verlist.get(0).toString() != null) {
+                    archiEleDicy.setVersion(verlist.get(i).getVersion());
+                }
+            }
+        } else if (archiEleDicy.getState() == 1 && archiEleDicy.getVersion() != null) {
+            String str = archiEleDicy.getVersion();
+            String ver = VersionUtil.getNextVersion(str);
+            archiEleDicy.setVersion(ver);
+        }
+        archiEleDicyService.updateById(archiEleDicy);
+        return Result.success();
+    }
+
+
+    @PostMapping(value = "/archiDicyList")
+    @ApiOperation(value = "查询字典元素数据")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "查询字典元素数据", moduleName = "字典数据属性")
+    public Result gtArchiDicyList(@RequestBody ArchiEleDicyDTO dto) {
+        return Result.success(archiEleDicyService.gtArchiDicyList(dto));
+    }
+}

framework-asset/src/main/java/org/arch/overall/mapper/ArchiEleDicyMapper.java

+package org.arch.overall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.arch.common.modules.archoverall.dto.ArchiEleDicyDTO;
+import org.arch.common.modules.archoverall.entity.ArchiEleDicy;
+
+import java.util.List;
+
+public interface ArchiEleDicyMapper extends BaseMapper<ArchiEleDicy> {
+
+    List<ArchiEleDicy> selectVer();
+
+    List<ArchiEleDicy> gtArchiDicyList(@Param("dto") ArchiEleDicyDTO dto);
+
+}

framework-asset/src/main/java/org/arch/overall/service/ArchiEleDicyService.java

+package org.arch.overall.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.arch.common.modules.archoverall.dto.ArchiEleDicyDTO;
+import org.arch.common.modules.archoverall.entity.ArchiEleDicy;
+
+
+import java.util.List;
+
+public interface ArchiEleDicyService extends IService<ArchiEleDicy> {
+
+    List<ArchiEleDicy> selectVer();
+
+    /**
+     * 查询字典
+     *
+     * @param dto DTO
+     * @return {@link List }<{@link ArchiEleDicy }>
+     */
+    List<ArchiEleDicy> gtArchiDicyList(ArchiEleDicyDTO dto);
+}

framework-asset/src/main/java/org/arch/overall/service/impl/ArchiEleDicyImpl.java

+package org.arch.overall.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.arch.common.modules.archoverall.dto.ArchiEleDicyDTO;
+import org.arch.common.modules.archoverall.entity.ArchiEleDicy;
+import org.arch.overall.mapper.ArchiEleDicyMapper;
+import org.arch.overall.service.ArchiEleDicyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ArchiEleDicyImpl extends ServiceImpl<ArchiEleDicyMapper, ArchiEleDicy> implements ArchiEleDicyService {
+
+    @Autowired
+    private ArchiEleDicyMapper archiEleDicyMapper;
+
+    @Override
+    public List<ArchiEleDicy> selectVer() {
+        return archiEleDicyMapper.selectVer();
+    }
+
+    @Override
+    public List<ArchiEleDicy> gtArchiDicyList(ArchiEleDicyDTO dto) {
+        return archiEleDicyMapper.gtArchiDicyList(dto);
+    }
+}

framework-asset/src/main/resources/mapper/ArchiEleDicyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.arch.overall.mapper.ArchiEleDicyMapper">
+    <resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiEleDicy">
+        <result column="dicy_id" property="dicyId"/>
+        <result column="dicy_code" property="dicyCode"/>
+        <result column="type" property="type"/>
+        <result column="type_id" property="typeId"/>
+        <result column="version" property="version"/>
+        <result column="state" property="state"/>
+        <result column="create_man" property="createMan"/>
+        <result column="create_time" property="createTime"/>
+        <result column="last_update_time" property="lastUpdateTime"/>
+        <result column="last_update_man" property="lastUpdateMan"/>
+        <result column="del_flag" property="delFlag"/>
+    </resultMap>
+
+    <select id="selectVer" resultMap="BaseResultMap">
+        select (SELECT CONCAT((SELECT REPLACE((select date_format(now(), '%Y-%m-%d')), CHAR(45), '')), '-V', (SELECT (select date_format(now(), '%Y')) - 2023 + 1), '.',
+                              (select date_format(now(), '%m')), '.', '1')) as version
+    </select>
+
+    <select id="gtArchiDicyList" resultType="org.arch.common.modules.archoverall.entity.ArchiEleDicy">
+        SELECT ae.element_name,
+               ae.archi_level_id,
+               ae.archi_belong_id,
+               ae.content,
+               aed.state,
+               aed.type,
+               aed.type_id,
+               aed.version,
+               aed.dicy_id
+        FROM archi_ele_dicy aed,
+             archi_element ae
+        WHERE aed.type_id = ae.element_id
+          AND aed.type = '1'
+          AND aed.del_flag = '0'
+          AND ae.del_flag = '0'
+        <if test="dto.elementName != null and dto.elementName != ''">
+            AND ae.element_name LIKE CONCAT('%', #{dto.elementName}, '%')
+        </if>
+        <if test="dto.archiBelongId != null">
+            AND ae.archi_belong_id = #{dto.archiBelongId}
+        </if>
+        <if test="dto.state != null">
+            AND aed.state = #{dto.state}
+        </if>
+        ORDER BY ae.ea_level
+    </select>
+</mapper>
\ No newline at end of file

framework-asset/src/main/resources/mapper/ArchiMetaModelMapper.xml

@@ -77,7 +77,7 @@
                amm.state,
                amm.graph_id,
                gr.icon                                                           as meta_model_svg,
-               ifnull(gr.content, '${@com.eadc.common.Constant@MX_MODEL_GRAPH}') as meta_model_data
+               ifnull(gr.content, '${@org.arch.common.Constant@MX_MODEL_GRAPH}') as meta_model_data
         from archi_meta_model amm
                  left join graph_repository gr on amm.graph_id = gr.graph_id
         where amm.meta_model_id = #{metaModelId}

framework-clouds/common/src/main/java/org/arch/common/Constant.java

+package org.arch.common;
+
+public class Constant {
+
+    /**
+     * 创建资产根节点标识
+     */
+    public static final String NO = "无";
+    /**
+     * redis过期时间，以秒为单位，一分钟
+     */
+    public static final int EXRP_MINUTE = 60;
+
+    /**
+     * redis过期时间，以秒为单位，一小时
+     */
+    public static final int EXRP_HOUR = 60 * 60;
+
+    /**
+     * redis过期时间，以秒为单位，一天
+     */
+    public static final int EXRP_DAY = 60 * 60 * 24;
+
+    /**
+     * redis-key-前缀-shiro:cache:
+     */
+    public static final String PREFIX_SHIRO_CACHE = "shiro:cache:";
+    /**
+     * 用户信息缓存
+     */
+    public static final String USER_ACCOUNT = "user_account:";
+    /**
+     * redis-key-前缀-shiro:access_token:
+     */
+    public static final String PREFIX_SHIRO_ACCESS_TOKEN = "shiro:access_token:";
+
+    /**
+     * redis-key-前缀-shiro:refresh_token:
+     */
+    public static final String PREFIX_SHIRO_REFRESH_TOKEN = "shiro:refresh_token:";
+
+    /**
+     * redis-key-前缀-tkv:refresh_token:
+     */
+    public static final String PREFIX_TKV_REFRESH_TOKEN = "tkv:refresh_token:";
+
+    /**
+     * JWT-account:
+     */
+    public static final String ACCOUNT = "account";
+
+    /**
+     * JWT-currentTimeMillis:
+     */
+    public static final String CURRENT_TIME_MILLIS = "currentTimeMillis";
+
+    /**
+     * PASSWORD_MAX_LEN
+     */
+    public static final Integer PASSWORD_MAX_LEN = 8;
+
+    //token
+    public static final int RESCODE_REFTOKEN_MSG = 1006;        //刷新TOKEN(有返回数据)
+    public static final int RESCODE_REFTOKEN = 1007;            //刷新TOKEN
+
+    public static final int JWT_ERRCODE_NULL = 4000;            //Token不存在
+    public static final int JWT_ERRCODE_EXPIRE = 4001;            //Token过期
+    public static final int JWT_ERRCODE_FAIL = 4002;            //验证不通过
+
+    //密匙
+    public static final String JWT_SECRET = "8677df7fc87d23u87k61c89s54312hpk";
+
+    public static final String TOKEN_ISSUER = "IT4IT";
+
+    //token失效的时间，单位：秒，默认设置3天
+    public static final Long ACCESS_TOKEN_EXPIRE = 7 * 24 * 60 * 60L;
+
+    //accessToken在header中的key
+    public static final String ACCESS_TOKEN_HEADER_KEY = "accessToken";
+
+    //用户sessionKey前缀
+    public static final String USER_SESSION_KEY = "User:Session:key:";
+
+    //用户令牌前缀
+    public static final String JWT_TOKEN_REDIS_KEY_PREFIX = "UserAuth:JWT:Key:";
+
+    //省市区redis key，缓存7天
+    public static final String AREA_REDIS_KEY = "areaKey";
+    public static final Long AREA_REDIS_EXPEPIRE = 7 * 24 * 60 * 60L;
+
+    //一次最多只能两个时段
+    public static final Integer EVERY_TIME_MAX_TWO_TIMES = 2;
+
+    //排队受理业务人均时长，单位：分钟
+    public static final Integer LINE_PER_TIMES = 3;
+
+    //订单到期规定的时间不能取消订单（分钟）
+    public static final Integer VALID_EXPIRE_TIME = 120;
+
+    //演示系统账户
+    public static String DEMO_ACCOUNT = "test";
+    //自动去除表前缀
+    public static String AUTO_REOMVE_PRE = "true";
+    //停止计划任务
+    public static String STATUS_RUNNING_STOP = "stop";
+    //开启计划任务
+    public static String STATUS_RUNNING_START = "start";
+    //通知公告阅读状态-未读
+    public static String OA_NOTIFY_READ_NO = "0";
+    //通知公告阅读状态-已读
+    public static int OA_NOTIFY_READ_YES = 1;
+    //部门根节点id
+    public static Long DEPT_ROOT_ID = 0l;
+    //缓存方式
+    public static String CACHE_TYPE_REDIS = "redis";
+
+    public static String LOG_ERROR = "error";
+
+
+    public static String HTTP = "http://";
+
+    /**
+     * 默认画布信息
+     */
+    public static final String MX_MODEL_GRAPH =
+            "<mxGraphModel dx=\"908\" dy=\"473\" grid=\"1\" gridSize=\"10\" guides=\"1\" tooltips=\"1\" connect=\"1\" arrows=\"1\" fold=\"1\" page=\"1\" pageScale=\"1\" pageWidth=\"827\" pageHeight=\"1169\" math=\"0\" shadow=\"0\">\n" +
+                    "  <root>\n" +
+                    "    <mxCell id=\"0\" />\n" +
+                    "    <mxCell id=\"1\" parent=\"0\" />\n" +
+                    "  </root>\n" +
+                    "</mxGraphModel>\n";
+
+    /**
+     * oss对象存储
+     */
+    public static final String BUCKET_NAME = "com/eadc";
+
+    /**
+     * 解析结构类型 1:线状结构；2：包含结构
+     */
+    public static final Integer STRUCTURE_TYPE_1 = 1;
+
+    /**
+     * 解析结构类型 1:线状结构；2：包含结构
+     */
+    public static final Integer STRUCTURE_TYPE_2 = 2;
+
+    /**
+     * 元模型数据
+     */
+    public static final String META_MODEL_DATA = "meta_model_data";
+
+    /**
+     * 架构视图数据
+     */
+    public static final String ARCHI_VIEW_DATA = "archi_view_data";
+
+    /**
+     * MX模型缓存key
+     */
+    public static final String MX_MODEL_KEY = "MX_MODEL_KEY";
+    /**
+     * 业务架构
+     */
+    public static final String ARCHI_BUSINESS ="ARCHI_BUSINESS";
+    /**
+     * 业务架构
+     */
+    public static final String ARCHI_APPLICATION ="ARCHI_APPLICATION";
+    /**
+     * 业务架构
+     */
+    public static final String ARCHI_TECHNOLOGY ="ARCHI_TECHNOLOGY";
+    /**
+     * 业务架构
+     */
+    public static final String ARCHI_SAFE ="ARCHI_SAFE";
+    /**
+     * 业务架构
+     */
+    public static final String ARCHI_DATA ="ARCHI_DATA";
+
+    public static final String WORD_TYPE="application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+
+    public static final String IMAGE_TYPE ="image/png";
+}

framework-clouds/common/src/main/java/org/arch/common/config/MybatisPlusConfig.java

+package org.arch.common.config;
+
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * MybatisPlus配置
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
+        // 添加分页插件
+        PaginationInnerInterceptor pageInterceptor = new PaginationInnerInterceptor();
+        // 设置请求的页面大于最大页后操作，true调回到首页，false继续请求。默认false
+        pageInterceptor.setOverflow(false);
+        // 单页分页条数限制，默认无限制
+        pageInterceptor.setMaxLimit(500L);
+        // 设置数据库类型
+        pageInterceptor.setDbType(DbType.MYSQL);
+
+        interceptor.addInnerInterceptor(pageInterceptor);
+        return interceptor;
+    }
+}

framework-clouds/common/src/main/java/org/arch/common/config/SwaggerConfig.java

+package org.arch.common.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+
+@Slf4j
+@Configuration
+@EnableSwagger2WebMvc
+public class SwaggerConfig {
+
+    @Bean(value = "dockerBean")
+    public Docket createRestApi() {
+        log.info("初始化Swagger配置");
+        // 指定使用Swagger2规范
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(new ApiInfoBuilder()
+                        // 描述字段支持Markdown语法
+                        .description("# 架构工具")
+                        .version("1.0")
+                        .build())
+                .select()
+                // 这里指定Controller扫描包路径
+                .apis(RequestHandlerSelectors.basePackage("com.center.modules"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+}

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiEleDicyDTO.java

+package org.arch.common.modules.archoverall.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "元模型字典管理查询的传输对象", description = "元模型字典管理查询的传输对象")
+public class ArchiEleDicyDTO {
+	@ApiModelProperty(value = "当前页")
+    private Integer current;
+	
+    @ApiModelProperty(value = "每页显示条数")
+    private Integer pageSize;
+    
+    @ApiModelProperty(value = "总条数")
+    private Integer total;
+    
+    @ApiModelProperty(value = "类型  1: 架构元素 2: 元素关系 3: 架构视图")
+    private Integer type;
+
+    
+    @ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+    
+    @ApiModelProperty(value = "元素名称")
+    @TableField (exist = false)
+    private String elementName;
+
+    @ApiModelProperty(value = "架构层次")
+    @TableField (exist = false)
+    private Long archiLevelId;
+
+    @ApiModelProperty(value = "架构归属")
+    @TableField (exist = false)
+    private Long archiBelongId;
+    
+    @ApiModelProperty(value = "企业架构层级")
+    @TableField (exist = false)
+    private Integer eaLevel;
+    
+    @ApiModelProperty(value = "元素类型（1：标准图元；2：常规图元）")
+    @TableField (exist = false)
+    private Integer eleType;
+    
+    @ApiModelProperty(value = "元素关系名称")
+    @TableField (exist = false)
+    private String rsName;
+
+    @ApiModelProperty(value = "适用范围")
+    @TableField (exist = false)
+    private String scope;
+    
+    @ApiModelProperty(value = "架构视图名称")
+    @TableField (exist = false)
+    private String viewName;
+    
+    @ApiModelProperty(value = "架构层次")
+    @TableField (exist = false)
+    private Long schemaLevel;
+
+    @ApiModelProperty(value = "架构归属")
+    @TableField (exist = false)
+    private Long schemaBelong;
+}

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/entity/ArchiEleDicy.java

+package org.arch.common.modules.archoverall.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 lizhen
+ * @since 2023-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("archi_ele_dicy")
+@ApiModel(value="ArchiEleDicy", description="元模型字典")
+public class ArchiEleDicy implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "dicy_id", type = IdType.AUTO)
+    private Long dicyId;
+
+    @ApiModelProperty(value = "编码")
+    private String dicyCode;
+
+    @ApiModelProperty(value = "类型  1: 架构元素 2: 元素关系 3: 架构视图 4:资产元素关系")
+    private Integer type;
+
+    @ApiModelProperty(value = "架构元素或元素关系或架构视图或者架构元素关系 ID")
+    private Integer typeId;
+
+    @ApiModelProperty(value = "字典版本")
+    private String version;
+
+    @ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createMan;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty(value = "最后一次修改时间")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "最后一次修改人")
+    private Long lastUpdateMan;
+
+    @ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
+    private Integer delFlag;
+    
+    
+    @ApiModelProperty(value = "元素id")
+    @TableField (exist = false)
+    private String elementId;
+
+    @ApiModelProperty(value = "元素名称")
+    @TableField (exist = false)
+    private String elementName;
+
+    @ApiModelProperty(value = "架构层次")
+    @TableField (exist = false)
+    private Long archiLevelId;
+
+    @ApiModelProperty(value = "架构归属")
+    @TableField (exist = false)
+    private Long archiBelongId;
+    
+    @ApiModelProperty(value = "企业架构层级")
+    @TableField (exist = false)
+    private Integer eaLevel;
+    
+    @ApiModelProperty(value = "元素类型（1：标准图元；2：常规图元）")
+    @TableField (exist = false)
+    private Integer eleType;
+
+    @ApiModelProperty(value = "描述")
+    @TableField (exist = false)
+    private String content;
+    
+    
+    @ApiModelProperty(value = "元素关系id")
+    private Long eleRelaId;
+    
+    @ApiModelProperty(value = "元素关系名称")
+    @TableField (exist = false)
+    private String rsName;
+
+    @ApiModelProperty(value = "对象 1")
+    @TableField (exist = false)
+    private Long object1;
+
+    @ApiModelProperty(value = "对象 2")
+    @TableField (exist = false)
+    private Long object2;
+
+    @ApiModelProperty(value = "适用范围")
+    @TableField (exist = false)
+    private String scope;
+    
+    
+    @ApiModelProperty(value = "视图id")
+    @TableField (exist = false)
+    private Long viewId;
+    
+    @ApiModelProperty(value = "架构视图名称")
+    @TableField (exist = false)
+    private String viewName;
+    
+    @ApiModelProperty(value = "架构层次")
+    @TableField (exist = false)
+    private Long schemaLevel;
+
+    @ApiModelProperty(value = "架构归属")
+    @TableField (exist = false)
+    private Long schemaBelong;
+    
+    
+    @ApiModelProperty(value = "对象1")
+    @TableField (exist = false)
+    private Long eleGtId;
+
+    @ApiModelProperty(value = "对象2")
+    @TableField (exist = false)
+    private Long eleLtId;
+    
+    
+    @ApiModelProperty(value = "架构元素名称")
+    @TableField (exist = false)
+    private String eleName;
+    
+    @ApiModelProperty(value = "架构元素关系名称")
+    @TableField (exist = false)
+    private String relName;
+    
+    public static final String DICYID = "dicyId";
+    public static final String DICYCODE = "dicyCode";
+    public static final String TYPE = "type";
+    public static final String TYPEID = "typeId";
+    public static final String VERSION = "version";
+    public static final String STSTE = "state";
+    public static final String CREATEMAN = "createMan";
+    public static final String CREATETIME = "createTime";
+    public static final String LASTUPDATETIME = "lastUpdateTime";
+    public static final String LASTUPDATEMAN = "lastUpdateMan";
+    public static final String DELFLAG = "delFlag";
+    
+    public static final String ELEMENTID = "elementId";
+    public static final String ELEMENTNAME = "elementName";
+	public static final String ARCHILEVELID = "archiLevelId";
+    public static final String ARCHIBELONGID = "archiBelongId";	    
+    public static final String CONTENT = "content";
+    
+    public static final String ELERELAID = "eleRelaId";
+    public static final String RSNAME = "rsName";
+    public static final String OBJECT1 = "object1";
+    public static final String OBJECT2 = "object2";
+    public static final String SCOPE = "scope";
+    
+    public static final String VIEWID = "viewId";
+    public static final String VIEWNAME = "viewName";
+    public static final String SCHEMALEVEL = "schemaLevel";
+    public static final String SCHEMABELONG = "schemaBelong";
+    
+    public static final String ELEGTID = "eleGtId";
+    public static final String ELELTID = "eleLtId";
+    
+}