Skip to content

Administrator / framework-tools

Go to a project
Commit 22869399 by henry
Options

修改配置文件

1 parent 23ff05a7
Inline Side-by-side
Showing with 489 additions and 26 deletions
.idea/uiDesigner.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
README.md
...@@ -8,3 +8,6 @@ ...@@ -8,3 +8,6 @@
## sys-manage 系统管理微服务（字典管理、菜单管理、用户及组织管理） ## sys-manage 系统管理微服务（字典管理、菜单管理、用户及组织管理）
## arch-gateway ## arch-gateway
## arch-base 基础服务-包括工具类-及对象实体 ## arch-base 基础服务-包括工具类-及对象实体
## vo（View Object）：视图对象，用于展示层
## dto（Data Transfer Object）：数据传输对象
## pojo（Persistent Object）：持久化对象
\ No newline at end of file
arch-base/pom.xml
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElePropertyDTO.java 0 → 100644
package org.arch.modules.archoverall.dto;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
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_property")
@ApiModel(value="ArchiEleProperty", description="元模型字典中间表")
public class ArchiElePropertyDTO implements Serializable{
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId(value = "property_id", type = IdType.AUTO)
private Long propertyId;
@ApiModelProperty(value = "架构元素或元素关系或架构视图 ID")
private Long typeId;
@ApiModelProperty(value = "类型 1: 架构元素 2: 元素关系 3: 架构视图")
private Integer type;
@ApiModelProperty(value = "字段名")
private String fieldName;
@ApiModelProperty(value = "中文名")
private String cnName;
@ApiModelProperty(value = "属性值")
private String propertyValue;
@ApiModelProperty(value = "排序")
private Integer displayOrder;
@ApiModelProperty(value = "长度")
private Integer contentLength;
@ApiModelProperty(value = "控件类型")
private Integer controlType;
@ApiModelProperty(value = "关联sys_dict表")
private String dictKey;
@ApiModelProperty(value = "创建人")
private Long createMan;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "最后一次修改时间")
private Date lastUpdateTime;
@ApiModelProperty(value = "最后一次修改人")
private Long lastUpdateMan;
@ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
private Integer delFlag;
@ApiModelProperty(value = "默认值（如果类型为select下拉框时，数据用英文逗号分隔）")
private String defaultValue;
@ApiModelProperty(value = "是否可以为空（0 为空 1 不为空）-用于页面校验时判断是否为空")
private String notNull;
@ApiModelProperty(value = "是否显示（0 显示 1 不显示-用于页面上判断是否显示）")
private String isShow;
@ApiModelProperty(value = "数据类型")
private String dataType;
@ApiModelProperty(value = "数据类型名称")
private String dataTypeName;
@ApiModelProperty(value = "排序")
private String sort;
@ApiModelProperty(value = "字典版本")
@TableField (exist = false)
private String version;
@ApiModelProperty(value = "字典表id")
private Long dicyId;
@ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存")
@TableField (exist = false)
private Integer state;
public static final String PROPERTYID = "propertyId";
public static final String TYPEID = "typeId";
public static final String TYPE = "type";
public static final String FIELDNAME = "fieldName";
public static final String CNNAME = "cnName";
public static final String DISPLAYORDER = "displayOrder";
public static final String CONTENTLENGTH = "contentLength";
public static final String CONTROLTYPE = "controlType";
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 PROPERTYVALUE = "propertyValue";
public static final String VERSION = "version";
public static final String DICYID = "dicyId";
public static final String STSTE = "state";
}
arch-overall/src/main/java/org/arch/modules/design/dto/ArchiElementDTO.java → arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElementDTO.java
package org.arch.modules.design.dto; package org.arch.modules.archoverall.dto;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.arch.common.entity.BasePageEntity; import org.arch.modules.base.dto.BasePageEntity;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/common/entity/BaseEntity.java → arch-base/src/main/java/org/arch/modules/base/dto/BaseEntity.java
package org.arch.common.entity; package org.arch.modules.base.dto;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.OrderBy; import com.baomidou.mybatisplus.annotation.OrderBy;
......
arch-overall/src/main/java/org/arch/common/entity/BasePageEntity.java → arch-base/src/main/java/org/arch/modules/base/dto/BasePageEntity.java
package org.arch.common.entity; package org.arch.modules.base.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-base/src/main/java/org/arch/utils/VersionUtil.java 0 → 100644
package org.arch.utils;
import cn.hutool.core.util.StrUtil;
public class VersionUtil {
/**
* 获取下一个版本
*
* @param version 版本
* @return {@link String }
*/
public static String getNextVersion(String version) {
if (StrUtil.isBlankIfStr(version)) {
return "";
}
int secondDotIndex = version.indexOf(".", version.indexOf(".") + 1);
return version.substring(0, secondDotIndex) + "." + (Integer.parseInt(version.substring(secondDotIndex + 1)) + 1);
}
}
arch-overall/pom.xml
...@@ -37,6 +37,18 @@ ...@@ -37,6 +37,18 @@
<version>1.4.11</version> <version>1.4.11</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus-boot-starter.version}</version>
</dependency>
<!-- mybatis-plus-extension -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus-boot-starter.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
arch-overall/src/main/java/org/arch/modules/design/controller/ArchiElementController.java
package org.arch.modules.design.controller; package org.arch.modules.design.controller;
import com.eadc.modules.design.entity.ArchiElement;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.arch.Result; import org.arch.Result;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.design.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.pojo.ArchiElement;
import org.arch.modules.design.service.ArchiElementService; import org.arch.modules.design.service.ArchiElementService;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
......
arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElePropertyMapper.java 0 → 100644
package org.arch.modules.design.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.arch.modules.design.pojo.ArchiEleProperty;
import java.util.List;
public interface ArchiElePropertyMapper extends BaseMapper<ArchiEleProperty> {
}
arch-overall/src/main/java/org/arch/modules/design/service/mapper/ArchiElementMapper.java → arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElementMapper.java
package org.arch.modules.design.service.mapper; package org.arch.modules.design.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.eadc.modules.design.entity.ArchiElement;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.modules.design.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.pojo.ArchiElement;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/mapper/VersionInitMapper.java 0 → 100644
package org.arch.modules.design.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface VersionInitMapper extends BaseMapper {
}
arch-overall/src/main/java/org/arch/modules/design/pojo/ArchiEleProperty.java 0 → 100644
package org.arch.modules.design.pojo;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
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_property")
@ApiModel(value="ArchiEleProperty", description="元模型字典中间表")
public class ArchiEleProperty implements Serializable{
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId(value = "property_id", type = IdType.AUTO)
private Long propertyId;
@ApiModelProperty(value = "架构元素或元素关系或架构视图或架构元素关系 ID")
private Long typeId;
@ApiModelProperty(value = "类型 1: 架构元素 2: 元素关系 3: 架构视图 4：架构元素关系")
private Integer type;
@ApiModelProperty(value = "字段名")
private String fieldName;
@ApiModelProperty(value = "中文名")
private String cnName;
@ApiModelProperty(value = "属性值")
private String propertyValue;
@ApiModelProperty(value = "排序")
private Integer displayOrder;
@ApiModelProperty(value = "长度")
private Integer contentLength;
@ApiModelProperty(value = "控件类型")
private Integer controlType;
@ApiModelProperty(value = "关联sys_dict表")
private String dictKey;
@ApiModelProperty(value = "创建人")
private Long createMan;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "最后一次修改时间")
private Date lastUpdateTime;
@ApiModelProperty(value = "最后一次修改人")
private Long lastUpdateMan;
@ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
private Integer delFlag;
@ApiModelProperty(value = "默认值（如果类型为select下拉框时，数据用英文逗号分隔）")
private String defaultValue;
@ApiModelProperty(value = "是否可以为空（0 为空 1 不为空）-用于页面校验时判断是否为空")
private String notNull;
@ApiModelProperty(value = "是否显示（0 显示 1 不显示-用于页面上判断是否显示）")
private String isShow;
@ApiModelProperty(value = "数据类型")
private String dataType;
@ApiModelProperty(value = "数据类型名称")
private String dataTypeName;
@ApiModelProperty(value = "排序")
private String sort;
@ApiModelProperty(value = "字典版本")
@TableField (exist = false)
private String version;
@ApiModelProperty(value = "字典表id")
private Long dicyId;
@ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存")
@TableField (exist = false)
private Integer state;
public static final String PROPERTYID = "propertyId";
public static final String TYPEID = "typeId";
public static final String TYPE = "type";
public static final String FIELDNAME = "fieldName";
public static final String CNNAME = "cnName";
public static final String DISPLAYORDER = "displayOrder";
public static final String CONTENTLENGTH = "contentLength";
public static final String CONTROLTYPE = "controlType";
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 PROPERTYVALUE = "propertyValue";
public static final String VERSION = "version";
public static final String DICYID = "dicyId";
public static final String STSTE = "state";
}
arch-overall/src/main/java/org/arch/modules/design/pojo/ArchiElement.java
package com.eadc.modules.design.entity; package org.arch.modules.design.pojo;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.arch.common.entity.BaseEntity; import org.arch.modules.base.dto.BaseEntity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/service/ArchiElementService.java
...@@ -2,9 +2,10 @@ package org.arch.modules.design.service; ...@@ -2,9 +2,10 @@ package org.arch.modules.design.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.eadc.modules.design.entity.ArchiElement;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.design.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.pojo.ArchiEleProperty;
import org.arch.modules.design.pojo.ArchiElement;
import java.util.List; import java.util.List;
...@@ -14,7 +15,6 @@ public interface ArchiElementService extends IService<ArchiElement> { ...@@ -14,7 +15,6 @@ public interface ArchiElementService extends IService<ArchiElement> {
* 元素列表 * 元素列表
* *
* @param dto DTO * @param dto DTO
* @param page 页
* @return {@link IPage }<{@link ArchiElement }> * @return {@link IPage }<{@link ArchiElement }>
*/ */
IPage<ArchiElement> gtArchiElement(ArchiElementDTO dto); IPage<ArchiElement> gtArchiElement(ArchiElementDTO dto);
...@@ -60,6 +60,15 @@ public interface ArchiElementService extends IService<ArchiElement> { ...@@ -60,6 +60,15 @@ public interface ArchiElementService extends IService<ArchiElement> {
List<ArchiElement> gtEleList(ArchiElementDTO dto); List<ArchiElement> gtEleList(ArchiElementDTO dto);
/** /**
* 查找元模型属性
*
* @param type 类型
* @param idList ID 列表
* @return {@link List }<{@link ArchiEleProperty }>
*/
List<ArchiEleProperty> findMetaModelProperties(int type, List<Long> idList);
/**
* 查询元素列表 * 查询元素列表
* *
* @param params 参数 * @param params 参数
......
arch-overall/src/main/java/org/arch/modules/design/service/impl/ArchiElementImpl.java
...@@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; ...@@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.eadc.modules.design.entity.ArchiElement;
import com.eadc.modules.design.service.mapper.ArchiElementMapper;
import com.github.xiaoymin.knife4j.core.util.StrUtil; import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.design.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.mapper.ArchiElePropertyMapper;
import org.arch.modules.design.pojo.ArchiEleProperty;
import org.arch.modules.design.pojo.ArchiElement;
import org.arch.modules.design.service.ArchiElementService; import org.arch.modules.design.service.ArchiElementService;
import org.arch.modules.design.mapper.ArchiElementMapper;
import org.arch.utils.VersionUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -28,7 +31,8 @@ public class ArchiElementImpl extends ServiceImpl<ArchiElementMapper, ArchiEleme ...@@ -28,7 +31,8 @@ public class ArchiElementImpl extends ServiceImpl<ArchiElementMapper, ArchiEleme
@Resource @Resource
private ArchiElementMapper archiElementMapper; private ArchiElementMapper archiElementMapper;
@Resource
private ArchiElePropertyMapper archiElePropertyMapper;
@Override @Override
public IPage<ArchiElement> gtArchiElement(ArchiElementDTO dto) { public IPage<ArchiElement> gtArchiElement(ArchiElementDTO dto) {
return archiElementMapper.gtArchiElement(dto, PageDTO.of(dto.getCurrent(), dto.getPageSize())); return archiElementMapper.gtArchiElement(dto, PageDTO.of(dto.getCurrent(), dto.getPageSize()));
......
arch-overall/src/main/resources/mapper/modules/asset/ArchiElementMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.eadc.modules.design.service.mapper.ArchiElementMapper"> <mapper namespace="org.arch.modules.design.mapper.ArchiElementMapper">
<resultMap id="BaseResultMap" type="com.eadc.modules.design.entity.ArchiElement"> <resultMap id="BaseResultMap" type="org.arch.modules.design.pojo.ArchiElement">
<result column="element_id" property="elementId"/> <result column="element_id" property="elementId"/>
<result column="element_code" property="elementCode"/> <result column="element_code" property="elementCode"/>
<result column="element_name" property="elementName"/> <result column="element_name" property="elementName"/>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
<result column="archi_belong_code" property="archiBelongCode"/> <result column="archi_belong_code" property="archiBelongCode"/>
</resultMap> </resultMap>
<select id="initVersion" resultType="com.eadc.modules.design.entity.ArchiElement"> <select id="initVersion" resultType="org.arch.modules.design.pojo.ArchiElement">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version; SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version;
</select> </select>
<!--元素列表--> <!--元素列表-->
<select id="gtArchiElement" resultType="com.eadc.modules.design.entity.ArchiElement"> <select id="gtArchiElement" resultType="org.arch.modules.design.pojo.ArchiElement">
select se.*, select se.*,
gm.graph_name as iconName, gm.graph_name as iconName,
gm.icon gm.icon
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</select> </select>
<!--根据元素名称查询元素--> <!--根据元素名称查询元素-->
<select id="gtArcEleByName" resultType="com.eadc.modules.design.entity.ArchiElement"> <select id="gtArcEleByName" resultType="org.arch.modules.design.pojo.ArchiElement">
select se.element_id, select se.element_id,
se.element_name, se.element_name,
se.archi_belong_id, se.archi_belong_id,
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
order by se.create_time desc order by se.create_time desc
</select> </select>
<select id="gtEleList" resultType="com.eadc.modules.design.entity.ArchiElement"> <select id="gtEleList" resultType="org.arch.modules.design.pojo.ArchiElement">
select se.*, select se.*,
gm.graph_name as iconName, gm.graph_name as iconName,
gm.icon gm.icon
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
order by se.create_time desc order by se.create_time desc
</select> </select>
<select id="maxVer" resultType="com.eadc.modules.design.entity.ArchiElement"> <select id="maxVer" resultType="org.arch.modules.design.pojo.ArchiElement">
SELECT a.version SELECT a.version
FROM archi_element a FROM archi_element a
<where> <where>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<!--获取最新版本--> <!--获取最新版本-->
<select id="getVersion" resultType="java.lang.String"> <select id="getVersion" resultType="java.lang.String">
set @i := (<include refid="com.eadc.modules.design.service.mapper.VersionInitMapper.versionInit"/>); set @i := (<include refid="org.arch.modules.design.mapper.VersionInitMapper.versionInit"/>);
select ifnull(version, @i) from archi_element where element_id = #{elementId} for update select ifnull(version, @i) from archi_element where element_id = #{elementId} for update
</select> </select>
</mapper> </mapper>
\ No newline at end of file
arch-overall/src/main/resources/mapper/modules/asset/VersionInitMapper.xml 0 → 100644
<?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.modules.design.mapper.VersionInitMapper">
<sql id="versionInit">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version
</sql>
</mapper>
\ 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!