Commit 61db86a1 by henry

修改实体对象

1 parent 5f308eb9
Showing with 188 additions and 208 deletions
package org.arch.overall.dto;
package org.arch.common.modules.archoverall.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
......@@ -9,8 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.arch.common.modules.archoverall.dto.BasePageEntity;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import java.util.List;
......
package org.arch.overall.dto;
package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.arch.config.LongListFormatSerializer;
import org.arch.overall.entity.ArchiAssetRelated;
import org.arch.common.modules.archoverall.entity.ArchiAssetRelated;
import java.io.Serializable;
import java.util.Date;
......
package org.arch.overall.dto;
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;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import java.math.BigDecimal;
import java.util.List;
......
package org.arch.overall.dto;
package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......
package org.arch.common.modules.archoverall.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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
*/
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "ArchiViewDTO", description = "架构视图配置DTO")
public class ArchiViewDTO {
@ApiModel(value = "视图配置查询的传输对象", description = "视图配置查询的传输对象")
public class ArchiViewDTO extends BasePageEntity {
@ApiModelProperty(value = "总条数")
private Integer total;
@ApiModelProperty(value = "审查类型")
private ArchiPrjReviewEnum reviewEnum;
@ApiModelProperty(value = "主键")
@TableId(value = "view_id", type = IdType.AUTO)
private Long viewId;
@ApiModelProperty(value = "架构归属 1 业务架构 2 应用架构 3 数据架构 4 技术架构 5 安全架构")
private Integer archiBelongId;
@ApiModelProperty(value = "架构视图名称")
private String viewName;
@ApiModelProperty(value = "项目ID")
private Long prjId;
@ApiModelProperty(value = "架构层次")
private Long archiLevelId;
@ApiModelProperty(value = "系统ID")
private Long appId;
@ApiModelProperty(value = "架构归属")
private Long archiBelongId;
@ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
private Integer state;
@ApiModelProperty(value = "架构阶段(1:总体架构;2:系统架构 3:概设架构 4:其他架构)")
private Integer archiStage;
@ApiModelProperty(value = "业务资料类型")
private String busiFileName;
@ApiModelProperty(value = "适用范围(1:总体架构 2:系统架构 3:总体及系统架构)")
private Integer scope;
@ApiModelProperty(value = "适用范围集合")
@TableField(exist = false)
private List<Long> scopeList;
}
package org.arch.common.modules.archoverall.dto.design;
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;
}
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
......
package org.arch.overall.entity;
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.overall.vo;
package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import java.util.List;
......
......@@ -11,9 +11,9 @@ import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.overall.dto.ArchiDto;
import org.arch.overall.entity.ArchiElementNestRelation;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.dto.ArchiDto;
import org.arch.common.modules.archoverall.entity.ArchiElementNestRelation;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.overall.service.ArchiAssetInfoService;
import org.arch.overall.utils.GenerateAssetCodeUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -5,7 +5,7 @@ import org.arch.Result;
import org.arch.log.entity.DescContent;
import org.arch.common.modules.archoverall.dto.ele.ArchiEleRelaDTO;
import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
import org.arch.overall.entity.ArchiEleRela;
import org.arch.common.modules.archoverall.entity.ArchiEleRela;
import org.arch.overall.service.ArchiElePropertyService;
import org.arch.overall.service.ArchiEleRelaService;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -10,7 +10,7 @@ import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.common.modules.archoverall.dto.ele.ArchiElementDTO;
import org.arch.common.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.overall.entity.ArchiElement;
import org.arch.common.modules.archoverall.entity.ArchiElement;
import org.arch.overall.service.ArchiElementService;
import org.springframework.web.bind.annotation.*;
......
......@@ -11,7 +11,7 @@ import org.arch.common.modules.archoverall.dto.MetaModel;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.overall.entity.ArchiMetaModel;
import org.arch.common.modules.archoverall.entity.ArchiMetaModel;
import org.arch.overall.service.ArchiAssetInfoService;
import org.arch.overall.service.ArchiAssetService;
import org.arch.overall.service.ArchiMetaModelService;
......
......@@ -10,8 +10,8 @@ import org.arch.log.annotation.OperLog;
import org.arch.log.entity.DescContent;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.overall.dto.ArchiViewDTO;
import org.arch.overall.entity.ArchiView;
import org.arch.common.modules.archoverall.dto.ArchiViewDTO;
import org.arch.common.modules.archoverall.entity.ArchiView;
import org.arch.overall.service.ArchiViewService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
......
package org.arch.overall.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.arch.common.modules.archoverall.dto.BasePageEntity;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel(value = "视图配置查询的传输对象", description = "视图配置查询的传输对象")
public class ArchiViewDTO extends BasePageEntity {
@ApiModelProperty(value = "总条数")
private Integer total;
@ApiModelProperty(value = "主键")
@TableId(value = "view_id", type = IdType.AUTO)
private Long viewId;
@ApiModelProperty(value = "架构视图名称")
private String viewName;
@ApiModelProperty(value = "架构层次")
private Long archiLevelId;
@ApiModelProperty(value = "架构归属")
private Long archiBelongId;
@ApiModelProperty(value = "状态 0:已停用 1:已发布 2:暂存")
private Integer state;
@ApiModelProperty(value = "架构阶段(1:总体架构;2:系统架构 3:概设架构 4:其他架构)")
private Integer archiStage;
@ApiModelProperty(value = "适用范围(1:总体架构 2:系统架构 3:总体及系统架构)")
private Integer scope;
@ApiModelProperty(value = "适用范围集合")
@TableField(exist = false)
private List<Long> scopeList;
}
......@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archoverall.dto.ability.ArchiAbilityInventoryDataDTO;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetsRelationQueryDTO;
import org.arch.common.modules.archoverall.vo.ArchiAbilityAssetsRelationQueryVO;
import org.arch.overall.entity.ArchiAbilityAssetsRelation;
import org.arch.common.modules.archoverall.entity.ArchiAbilityAssetsRelation;
import java.util.List;
......
......@@ -11,8 +11,8 @@ import org.arch.common.modules.archoverall.dto.OnlineReviewCountQueryDTO;
import org.arch.common.modules.archoverall.dto.OnlineReviewWriteDTO;
import org.arch.common.modules.archoverall.vo.NeedReviewVo;
import org.arch.common.modules.archoverall.vo.OnlineReviewCountVO;
import org.arch.overall.entity.AssetInfo;
import org.arch.overall.entity.OnlineReviewWrite;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.OnlineReviewWrite;
import java.util.List;
......
package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.overall.entity.ArchiAssetAppPrj;
import org.arch.common.modules.archoverall.entity.ArchiAssetAppPrj;
/**
* <p>
......
......@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.common.modules.archoverall.dto.WordContentDTO;
import java.util.List;
import java.util.Map;
......
......@@ -2,7 +2,7 @@ package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.arch.overall.entity.ArchiAssetSystem;
import org.arch.common.modules.archoverall.entity.ArchiAssetSystem;
/**
* <p>
......
......@@ -2,7 +2,7 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
import java.util.List;
......
......@@ -3,7 +3,7 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.common.modules.archoverall.vo.ArchiEleRelaVO;
import org.arch.overall.entity.ArchiEleRelaConstrain;
import org.arch.common.modules.archoverall.entity.ArchiEleRelaConstrain;
import java.util.List;
......
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archoverall.dto.ele.ArchiEleRelaDTO;
import org.arch.common.modules.archoverall.vo.ArchiEleRelaNameVO;
import org.arch.overall.entity.ArchiEleRela;
import org.arch.common.modules.archoverall.entity.ArchiEleRela;
import java.util.List;
......
......@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archoverall.dto.ele.ArchiElementDTO;
import org.arch.overall.entity.ArchiElement;
import org.arch.common.modules.archoverall.entity.ArchiElement;
import java.util.List;
public interface ArchiElementMapper extends MPJBaseMapper<ArchiElement> {
......
......@@ -2,7 +2,7 @@ package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.arch.overall.entity.ArchiElementNestRelation;
import org.arch.common.modules.archoverall.entity.ArchiElementNestRelation;
/**
* <p>
......
......@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archoverall.dto.ele.ArchiMetaModelDTO;
import org.arch.overall.entity.ArchiMetaModel;
import org.arch.common.modules.archoverall.entity.ArchiMetaModel;
import java.util.List;
......
package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import org.arch.overall.entity.ArchiModelDictDetail;
import org.arch.common.modules.archoverall.entity.ArchiModelDictDetail;
/**
* <p>
......
package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import org.arch.overall.entity.ArchiModelDict;
import org.arch.common.modules.archoverall.entity.ArchiModelDict;
/**
* <p>
......
......@@ -4,7 +4,7 @@ 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.asset.ArchiAssetDTO;
import org.arch.common.modules.archoverall.dto.ArchiViewDTO;
import org.arch.common.modules.archoverall.dto.design.ArchiViewDTO;
import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
import org.arch.common.modules.archoverall.vo.ArchiViewVO;
......
package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.overall.entity.ArchiViewEle;
import org.arch.common.modules.archoverall.entity.ArchiViewEle;
public interface ArchiViewEleMapper extends BaseMapper<ArchiViewEle> {
......
......@@ -3,7 +3,7 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.arch.overall.entity.ArchiView;
import org.arch.common.modules.archoverall.entity.ArchiView;
import java.util.List;
......
......@@ -2,7 +2,7 @@ package org.arch.overall.mapper;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.overall.entity.GraphRepository;
import org.arch.common.modules.archoverall.entity.GraphRepository;
import org.arch.utils.Constant;
public interface GraphRepositoryMapper extends BaseMapper<GraphRepository> {
......
......@@ -6,9 +6,9 @@ import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetVisalDTO;
import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.common.modules.archoverall.vo.ArchVisualVO;
import org.arch.overall.dto.ArchiDto;
import org.arch.overall.entity.ArchiElementNestRelation;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.dto.ArchiDto;
import org.arch.common.modules.archoverall.entity.ArchiElementNestRelation;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import java.util.List;
import java.util.Map;
......
......@@ -11,7 +11,7 @@ import org.arch.common.modules.archoverall.vo.ArchiAbilityAssetsRelationQueryVO;
import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
import org.arch.common.modules.archoverall.vo.MxCellVO;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import java.util.List;
......
......@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.overall.entity.AssetInfo;
import org.arch.overall.vo.AssetInfoLevelVO;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.common.modules.archoverall.vo.AssetInfoLevelVO;
import java.util.List;
......
package org.arch.overall.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
import java.util.List;
import java.util.Map;
......
......@@ -7,7 +7,7 @@ import org.arch.common.modules.archoverall.dto.ele.ArchiEleRelaDTO;
import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
import org.arch.common.modules.archoverall.vo.ArchiEleRelaNameVO;
import org.arch.common.modules.archoverall.vo.ArchiEleRelaVO;
import org.arch.overall.entity.ArchiEleRela;
import org.arch.common.modules.archoverall.entity.ArchiEleRela;
import java.util.List;
......
......@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.ele.ArchiElementDTO;
import org.arch.common.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.overall.entity.ArchiElement;
import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
import org.arch.common.modules.archoverall.entity.ArchiElement;
import java.util.List;
......
......@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.ArchiListResultDTO;
import org.arch.common.modules.archoverall.dto.ele.ArchiMetaModelDTO;
import org.arch.overall.entity.ArchiMetaModel;
import org.arch.common.modules.archoverall.entity.ArchiMetaModel;
import java.util.List;
......
......@@ -2,7 +2,7 @@ package org.arch.overall.service;
import org.arch.common.modules.archoverall.vo.ArchiModelDictVO;
import org.arch.overall.entity.ArchiModelDict;
import org.arch.common.modules.archoverall.entity.ArchiModelDict;
import org.mapstruct.Mapper;
/**
......
......@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.ele.ArchiModelDictDetailDTO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
import org.arch.common.modules.base.dto.BathRemoveDTO;
import org.arch.overall.entity.ArchiModelDict;
import org.arch.overall.entity.ArchiModelDictDetail;
import org.arch.common.modules.archoverall.entity.ArchiModelDict;
import org.arch.common.modules.archoverall.entity.ArchiModelDictDetail;
import java.util.List;
......
......@@ -6,7 +6,7 @@ import org.arch.common.modules.archoverall.dto.ele.ArchiModelDictDTO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictVO;
import org.arch.common.modules.base.dto.BathRemoveDTO;
import org.arch.overall.entity.ArchiModelDict;
import org.arch.common.modules.archoverall.entity.ArchiModelDict;
import java.util.List;
......
package org.arch.overall.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.overall.entity.ArchiView;
import org.arch.overall.entity.ArchiViewEle;
import org.arch.common.modules.archoverall.entity.ArchiView;
import org.arch.common.modules.archoverall.entity.ArchiViewEle;
import org.jetbrains.annotations.NotNull;
import org.springframework.transaction.annotation.Transactional;
......
......@@ -3,9 +3,9 @@ package org.arch.overall.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.overall.dto.ArchiViewDTO;
import org.arch.common.modules.archoverall.dto.ArchiViewDTO;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.overall.entity.ArchiView;
import org.arch.common.modules.archoverall.entity.ArchiView;
public interface ArchiViewService extends IService<ArchiView> {
......
......@@ -29,8 +29,8 @@ import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
import org.arch.common.modules.archoverall.vo.MxCellVO;
import org.arch.enums.ArchiStateEnum;
import org.arch.overall.entity.ArchiAbilityAssetsRelation;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.ArchiAbilityAssetsRelation;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.overall.mapper.ArchiAbilityAssetsRelationMapper;
import org.arch.overall.mapper.ArchiAssertMapper;
import org.arch.overall.mapper.ArchiMetaModelMapper;
......
......@@ -18,10 +18,10 @@ import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetVisalDTO;
import org.arch.common.modules.archoverall.vo.ArchVisualVO;
import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.overall.dto.ArchiDto;
import org.arch.overall.entity.ArchiAssetSystem;
import org.arch.overall.entity.ArchiElementNestRelation;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.dto.ArchiDto;
import org.arch.common.modules.archoverall.entity.ArchiAssetSystem;
import org.arch.common.modules.archoverall.entity.ArchiElementNestRelation;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.overall.mapper.ArchiAssetInfoMapper;
import org.arch.overall.mapper.ArchiAssetSystemMapper;
import org.arch.overall.mapper.ArchiElementNestRelationMapper;
......
......@@ -19,9 +19,9 @@ import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
import org.arch.enums.ArchiStateEnum;
import org.arch.overall.entity.ArchiAssetAppPrj;
import org.arch.overall.entity.ArchiAssetSystem;
import org.arch.overall.entity.AssetInfo;
import org.arch.common.modules.archoverall.entity.ArchiAssetAppPrj;
import org.arch.common.modules.archoverall.entity.ArchiAssetSystem;
import org.arch.common.modules.archoverall.entity.AssetInfo;
import org.arch.overall.mapper.ArchiAssetAppPrjMapper;
import org.arch.overall.mapper.ArchiAssetInfoMapper;
import org.arch.overall.mapper.ArchiAssetSystemMapper;
......@@ -29,7 +29,7 @@ import org.arch.overall.service.ArchiAssetInfoService;
import org.arch.overall.service.ArchiAssetService;
import org.arch.overall.service.ArchiAssetSysService;
import org.arch.overall.service.ArchiModelDictDetailService;
import org.arch.overall.vo.AssetInfoLevelVO;
import org.arch.common.modules.archoverall.vo.AssetInfoLevelVO;
import org.arch.utils.VersionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
......@@ -2,7 +2,7 @@ package org.arch.overall.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
import org.arch.overall.mapper.ArchiElePropertyMapper;
import org.arch.overall.service.ArchiElePropertyService;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -15,9 +15,9 @@ import org.arch.common.modules.archoverall.dto.ele.ArchiEleRelaDTO;
import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
import org.arch.common.modules.archoverall.vo.ArchiEleRelaNameVO;
import org.arch.common.modules.archoverall.vo.ArchiEleRelaVO;
import org.arch.overall.entity.ArchiEleRela;
import org.arch.overall.entity.ArchiEleRelaConstrain;
import org.arch.overall.entity.ArchiElement;
import org.arch.common.modules.archoverall.entity.ArchiEleRela;
import org.arch.common.modules.archoverall.entity.ArchiEleRelaConstrain;
import org.arch.common.modules.archoverall.entity.ArchiElement;
import org.arch.overall.mapper.ArchiEleRelaConstrainMapper;
import org.arch.overall.mapper.ArchiEleRelaMapper;
import org.arch.overall.mapper.ArchiElementMapper;
......
......@@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.overall.entity.ArchiElement;
import org.arch.common.modules.archoverall.entity.ArchiEleProperty;
import org.arch.common.modules.archoverall.entity.ArchiElement;
import org.arch.overall.mapper.ArchiElePropertyMapper;
import org.arch.overall.mapper.ArchiElementMapper;
import org.arch.common.modules.archoverall.dto.ele.ArchiElementDTO;
......
......@@ -12,9 +12,9 @@ import org.arch.common.modules.archoverall.dto.*;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetInfoDTO;
import org.arch.common.modules.archoverall.dto.ele.ArchiElementDTO;
import org.arch.common.modules.archoverall.dto.ele.ArchiMetaModelDTO;
import org.arch.common.modules.archoverall.entity.*;
import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
import org.arch.overall.dto.ArchiEleDto;
import org.arch.overall.entity.*;
import org.arch.common.modules.archoverall.dto.ArchiEleDto;
import org.arch.overall.mapper.ArchiElementMapper;
import org.arch.overall.mapper.ArchiMetaModelMapper;
import org.arch.overall.mapper.ArchiViewEleMapper;
......
......@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
import org.arch.common.modules.archoverall.dto.ele.ArchiModelDictDetailDTO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
import org.arch.common.modules.base.dto.BathRemoveDTO;
import org.arch.overall.entity.ArchiModelDict;
import org.arch.overall.entity.ArchiModelDictDetail;
import org.arch.common.modules.archoverall.entity.ArchiModelDict;
import org.arch.common.modules.archoverall.entity.ArchiModelDictDetail;
import org.arch.overall.mapper.ArchiModelDictDetailMapper;
import org.arch.overall.mapper.ArchiModelDictMapper;
import org.arch.overall.service.ArchiModelDictDetailService;
......
......@@ -18,8 +18,8 @@ import org.arch.common.modules.archoverall.dto.ele.ArchiModelDictDTO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictDetailVO;
import org.arch.common.modules.archoverall.vo.ArchiModelDictVO;
import org.arch.common.modules.base.dto.BathRemoveDTO;
import org.arch.overall.entity.ArchiModelDict;
import org.arch.overall.entity.ArchiModelDictDetail;
import org.arch.common.modules.archoverall.entity.ArchiModelDict;
import org.arch.common.modules.archoverall.entity.ArchiModelDictDetail;
import org.arch.overall.service.ArchiModelDictCovert;
import org.arch.overall.mapper.ArchiModelDictDetailMapper;
import org.arch.overall.mapper.ArchiModelDictMapper;
......
package org.arch.overall.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.arch.overall.entity.ArchiViewEle;
import org.arch.common.modules.archoverall.entity.ArchiViewEle;
import org.arch.overall.mapper.ArchiViewEleMapper;
import org.arch.overall.service.ArchiViewEleService;
import org.springframework.stereotype.Service;
......
package org.arch.overall.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.overall.dto.ArchiViewDTO;
import org.arch.common.modules.archoverall.dto.ArchiViewDTO;
import org.arch.enums.ArchiStateEnum;
import org.arch.overall.entity.ArchiView;
import org.arch.overall.entity.ArchiViewEle;
import org.arch.common.modules.archoverall.entity.ArchiView;
import org.arch.common.modules.archoverall.entity.ArchiViewEle;
import org.arch.overall.mapper.ArchiViewEleMapper;
import org.arch.overall.mapper.ArchiViewMapper;
import org.arch.overall.service.ArchiViewEleService;
......
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.overall.mapper.ArchiAbilityAssetsRelationMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiAbilityAssetsRelation">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiAbilityAssetsRelation">
<!--@Table archi_ability_assets_relation-->
<result property="relaId" column="rela_id" jdbcType="INTEGER"/>
<result property="assetId" column="asset_id" jdbcType="INTEGER"/>
......@@ -85,7 +85,7 @@
</foreach>
</delete>
<select id="qryDataListPage" resultType="org.arch.overall.entity.ArchiAbilityAssetsRelation">
<select id="qryDataListPage" resultType="org.arch.common.modules.archoverall.entity.ArchiAbilityAssetsRelation">
SELECT *
FROM (
SELECT DISTINCT
......
<?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.ArchiAssertMapper">
<select id="maxVer" resultType="org.arch.overall.entity.AssetInfo">
<select id="maxVer" resultType="org.arch.common.modules.archoverall.entity.AssetInfo">
SELECT MAX(a.version) as version
FROM archi_asset_info a
<where>
......@@ -59,7 +59,7 @@
</select>
<!--查询概设材料列表-->
<select id="qyOnlineReview" resultType="org.arch.overall.entity.OnlineReviewWrite">
<select id="qyOnlineReview" resultType="org.arch.common.modules.archoverall.entity.OnlineReviewWrite">
SELECT ni.year,
ni.need_id,
ni.prj_id,
......
<?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.ArchiAssetInfoMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.AssetInfo">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.AssetInfo">
<!--@mbg.generated-->
<!--@Table archi_asset_info-->
<id column="asset_id" jdbcType="BIGINT" property="assetId"/>
......
<?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.ArchiElePropertyMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiEleProperty">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiEleProperty">
<result column="property_id" property="propertyId"/>
<result column="type_id" property="typeId"/>
<result column="type" property="type"/>
......
<?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.ArchiEleRelaConstrainMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiEleRelaConstrain">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiEleRelaConstrain">
<!--@mbg.generated-->
<!--@Table archi_ele_rela_constrain-->
<id column="constrain_id" jdbcType="BIGINT" property="constrainId"/>
......
<?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.ArchiEleRelaMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiEleRela">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiEleRela">
<result column="ele_rela_id" property="eleRelaId"/>
<result column="ele_rela_code" property="eleRelaCode"/>
<result column="rs_name" property="rsName"/>
......
<?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.ArchiElementMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiElement">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiElement">
<result column="element_id" property="elementId"/>
<result column="element_code" property="elementCode"/>
<result column="element_name" property="elementName"/>
......@@ -24,12 +24,12 @@
<result column="archi_belong_code" property="archiBelongCode"/>
</resultMap>
<select id="initVersion" resultType="org.arch.overall.entity.ArchiElement">
<select id="initVersion" resultType="org.arch.common.modules.archoverall.entity.ArchiElement">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version;
</select>
<!--元素列表-->
<select id="gtArchiElement" resultType="org.arch.overall.entity.ArchiElement">
<select id="gtArchiElement" resultType="org.arch.common.modules.archoverall.entity.ArchiElement">
select se.*,
gm.graph_name as iconName,
gm.icon
......@@ -54,7 +54,7 @@
</select>
<!--根据元素名称查询元素-->
<select id="gtArcEleByName" resultType="org.arch.overall.entity.ArchiElement">
<select id="gtArcEleByName" resultType="org.arch.common.modules.archoverall.entity.ArchiElement">
select se.element_id,
se.element_name,
se.archi_belong_id,
......@@ -73,7 +73,7 @@
order by se.create_time desc
</select>
<select id="gtEleList" resultType="org.arch.overall.entity.ArchiElement">
<select id="gtEleList" resultType="org.arch.common.modules.archoverall.entity.ArchiElement">
select se.*,
gm.graph_name as iconName,
gm.icon
......@@ -118,7 +118,7 @@
order by se.create_time desc
</select>
<select id="maxVer" resultType="org.arch.overall.entity.ArchiElement">
<select id="maxVer" resultType="org.arch.common.modules.archoverall.entity.ArchiElement">
SELECT a.version
FROM archi_element a
<where>
......
<?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.ArchiMetaModelMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiMetaModel">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiMetaModel">
<result column="meta_model_id" property="metaModelId"/>
<result column="meta_model_code" property="metaModelCode"/>
<result column="version" property="version"/>
......
<?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.ArchiViewEleMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiViewEle">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archoverall.entity.ArchiViewEle">
<result column="archi_view_id" property="archiViewId"/>
<result column="archi_ele_id" property="archiEleId"/>
<result column="ele_name" property="eleName"/>
......
<?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.ArchiViewMapper">
<select id="maxVer" resultType="org.arch.overall.entity.ArchiView">
<select id="maxVer" resultType="org.arch.common.modules.archoverall.entity.ArchiView">
SELECT a.version
FROM archi_view a
<where>
......
package org.arch;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}
\ No newline at end of file
package org.arch;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!