From 6fe44b3c81a928fe7a3fbc99256ae2f9b4fdbbea Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Mon, 1 Dec 2025 22:37:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/dao/DataTableField.java | 76 +++++ .../modules/app/dao/DataTableInfo.java | 81 +++++ .../jeesite/modules/app/dao/TableTree.java | 23 ++ .../jeesite/modules/app/utils/DateUtils.java | 12 - .../jeesite/modules/app/utils/KeyUtil.java | 48 +++ .../jeesite/modules/app/utils/MysqlUtils.java | 205 +++++++++++++ .../jeesite/modules/app/utils/SqlUtils.java | 97 ++++++ .../com/jeesite/modules/app/utils/vDate.java | 114 +++++++ .../com/jeesite/modules/app/utils/vId.java | 35 +++ .../com/jeesite/modules/app/utils/vo.java | 13 - .../modules/biz/dao/BizDbConfigDao.java | 15 + .../modules/biz/dao/BizTableInfoDao.java | 15 + .../modules/biz/entity/BizDbConfig.java | 110 +++++++ .../modules/biz/entity/BizTableInfo.java | 119 ++++++++ .../biz/service/BizDbConfigService.java | 134 ++++++++ .../biz/service/BizTableInfoService.java | 134 ++++++++ .../biz/web/BizDbConfigController.java | 149 +++++++++ .../biz/web/BizMonitorHostController.java | 4 +- .../biz/web/BizTableInfoController.java | 150 +++++++++ .../mappings/modules/biz/BizDbConfigDao.xml | 15 + .../mappings/modules/biz/BizTableInfoDao.xml | 15 + web-vue/packages/biz/api/biz/dbConfig.ts | 58 ++++ web-vue/packages/biz/api/biz/tableInfo.ts | 58 ++++ .../packages/biz/views/biz/dbConfig/form.vue | 164 ++++++++++ .../biz/views/biz/dbConfig/formImport.vue | 103 +++++++ .../packages/biz/views/biz/dbConfig/list.vue | 286 ++++++++++++++++++ .../packages/biz/views/biz/dbConfig/select.ts | 172 +++++++++++ .../biz/views/biz/deviceInfo/list.vue | 1 - .../biz/views/biz/deviceInfo/select.ts | 126 -------- .../biz/views/biz/serverInfo/list.vue | 1 - .../biz/views/biz/serverInfo/select.ts | 178 ----------- .../biz/views/biz/tableInfo/formImport.vue | 103 +++++++ .../packages/biz/views/biz/tableInfo/list.vue | 271 +++++++++++++++++ .../src/selectType/bizCompSelect.ts | 2 +- .../ListSelect/src/selectType/bizDbSelect.ts | 172 +++++++++++ .../ListSelect/src/selectType/bizEmpSelect.ts | 2 +- .../src/selectType/bizHostSelect.ts | 1 + .../src/selectType/bizProjectSelect.ts | 2 +- .../src/selectType/bizProvSelect.ts | 1 + .../src/selectType/empUserSelect.ts | 2 +- .../src/selectType/erpAccountSelect.ts | 1 + .../src/selectType/erpCategorySelect.ts | 1 + .../src/selectType/erpFlowSelect.ts | 2 +- .../ListSelect/src/selectType/userSelect.ts | 2 +- 44 files changed, 2934 insertions(+), 339 deletions(-) create mode 100644 web-api/src/main/java/com/jeesite/modules/app/dao/DataTableField.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/dao/DataTableInfo.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/dao/TableTree.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/utils/KeyUtil.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/utils/MysqlUtils.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/utils/SqlUtils.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java create mode 100644 web-api/src/main/java/com/jeesite/modules/app/utils/vId.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/dao/BizDbConfigDao.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/dao/BizTableInfoDao.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/entity/BizDbConfig.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/entity/BizTableInfo.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/service/BizDbConfigService.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/service/BizTableInfoService.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/web/BizTableInfoController.java create mode 100644 web-api/src/main/resources/mappings/modules/biz/BizDbConfigDao.xml create mode 100644 web-api/src/main/resources/mappings/modules/biz/BizTableInfoDao.xml create mode 100644 web-vue/packages/biz/api/biz/dbConfig.ts create mode 100644 web-vue/packages/biz/api/biz/tableInfo.ts create mode 100644 web-vue/packages/biz/views/biz/dbConfig/form.vue create mode 100644 web-vue/packages/biz/views/biz/dbConfig/formImport.vue create mode 100644 web-vue/packages/biz/views/biz/dbConfig/list.vue create mode 100644 web-vue/packages/biz/views/biz/dbConfig/select.ts delete mode 100644 web-vue/packages/biz/views/biz/deviceInfo/select.ts delete mode 100644 web-vue/packages/biz/views/biz/serverInfo/select.ts create mode 100644 web-vue/packages/biz/views/biz/tableInfo/formImport.vue create mode 100644 web-vue/packages/biz/views/biz/tableInfo/list.vue create mode 100644 web-vue/packages/core/components/ListSelect/src/selectType/bizDbSelect.ts diff --git a/web-api/src/main/java/com/jeesite/modules/app/dao/DataTableField.java b/web-api/src/main/java/com/jeesite/modules/app/dao/DataTableField.java new file mode 100644 index 00000000..3c068e56 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/dao/DataTableField.java @@ -0,0 +1,76 @@ +package com.jeesite.modules.app.dao; + + +import java.io.Serializable; +import java.time.LocalDateTime; + +import lombok.Data; + +/** + *

+ * 数据表字段信息表 + *

+ * + * @author gaoxq + * @since 2025-11-17 + */ +@Data +public class DataTableField implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 字段唯一标识（主键） + */ + private String fieldId; + + /** + * 关联的数据表ID（外键，关联data_table_info.table_id） + */ + private String tableId; + + /** + * 数据来源 + */ + private String dataSource; + + /** + * 数据表名称 + */ + private String dataName; + + /** + * 字段序号（表示字段在表中的顺序） + */ + private Integer fieldOrder; + + /** + * 字段类型（如：int、varchar、datetime等） + */ + private String fieldType; + + /** + * 字段名称 + */ + private String fieldName; + + /** + * 字段长度（如varchar(50)中的50，数值型可表示精度） + */ + private Long fieldLength; + + /** + * 字段说明 + */ + private String fieldRemark; + + /** + * 分区日期 + */ + private String ds; +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/dao/DataTableInfo.java b/web-api/src/main/java/com/jeesite/modules/app/dao/DataTableInfo.java new file mode 100644 index 00000000..86e71d5f --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/dao/DataTableInfo.java @@ -0,0 +1,81 @@ +package com.jeesite.modules.app.dao; + + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 数据表基础信息表 + *

+ * + * @author gaoxq + * @since 2025-11-17 + */ +@Data +public class DataTableInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 数据表唯一标识（主键） + */ + private String tableId; + + /** + * 数据表名称 + */ + private String dataName; + + /** + * 数据表描述 + */ + private String tableComment; + + /** + * 数据表大小（单位：MB） + */ + private BigDecimal tableSize; + + /** + * 数据来源（如：业务系统、文件导入等） + */ + private String dataSource; + + /** + * 创建人 + */ + private String creator; + + /** + * 记录条数 + */ + private Long dataRows; + + /** + * 更新时间 + */ + private String updateTime; + + /** + * 备注信息 + */ + private String remarks; + + /** + * 数据标识 + */ + private String dbId; + + /** + * 分区日期 + */ + private String ds; +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/dao/TableTree.java b/web-api/src/main/java/com/jeesite/modules/app/dao/TableTree.java new file mode 100644 index 00000000..c4775fac --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/dao/TableTree.java @@ -0,0 +1,23 @@ +package com.jeesite.modules.app.dao; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class TableTree implements Serializable { + + DataTableInfo tableInfo; + + List tableFields; + + public TableTree() { + } + + public TableTree(DataTableInfo tableInfo, List tableFields) { + this.tableInfo = tableInfo; + this.tableFields = tableFields; + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/DateUtils.java b/web-api/src/main/java/com/jeesite/modules/app/utils/DateUtils.java index cf871e13..da912a16 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/utils/DateUtils.java +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/DateUtils.java @@ -63,16 +63,4 @@ public class DateUtils { int quarter = (month - 1) / 3 + 1; return String.format("%d-Q%d", date.getYear(), quarter); } - - public static String dsValue() { - LocalDate currentDate = LocalDate.now(); - // 格式化日期为yyyymmdd - return currentDate.format(DATE_FORMATTER); - } - - - public static String dsValueDaysAgo(long days) { - LocalDate targetDate = LocalDate.now().minusDays(days); - return targetDate.format(DATE_FORMATTER); - } } diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/KeyUtil.java b/web-api/src/main/java/com/jeesite/modules/app/utils/KeyUtil.java new file mode 100644 index 00000000..6852b003 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/KeyUtil.java @@ -0,0 +1,48 @@ +package com.jeesite.modules.app.utils; + +import java.util.Random; + +public class KeyUtil { + + public static String ObjKey(int length, int type) { + Random random = new Random(); + StringBuffer key = new StringBuffer(); + if (type == 1) { + String str = "0123456789"; + for (int i = 0; i < length; ++i) { + //从62个的数字或字母中选择 + int number = random.nextInt(10); + //将产生的数字通过length次承载到key中 + key.append(str.charAt(number)); + } + return key.toString(); + } else if (type == 2) { + String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + for (int i = 0; i < length; ++i) { + //从62个的数字或字母中选择 + int number = random.nextInt(36); + //将产生的数字通过length次承载到key中 + key.append(str.charAt(number)); + } + return key.toString(); + } else if (type == 3) { + String str = "abcdefghijklmnopqrstuvwxyz0123456789"; + for (int i = 0; i < length; ++i) { + //从62个的数字或字母中选择 + int number = random.nextInt(36); + //将产生的数字通过length次承载到key中 + key.append(str.charAt(number)); + } + return key.toString(); + } else { + String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + for (int i = 0; i < length; ++i) { + //从62个的数字或字母中选择 + int number = random.nextInt(62); + //将产生的数字通过length次承载到key中 + key.append(str.charAt(number)); + } + return key.toString(); + } + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/MysqlUtils.java b/web-api/src/main/java/com/jeesite/modules/app/utils/MysqlUtils.java new file mode 100644 index 00000000..732121b9 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/MysqlUtils.java @@ -0,0 +1,205 @@ +package com.jeesite.modules.app.utils; + + +import com.jeesite.modules.app.dao.DataTableField; +import com.jeesite.modules.app.dao.DataTableInfo; +import com.jeesite.modules.app.dao.TableTree; +import com.jeesite.modules.biz.entity.BizDbConfig; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.sql.*; +import java.time.LocalDateTime; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class MysqlUtils { + + private static final LoggerUtils logger = LoggerUtils.getInstance(); + + // 需要排除的系统数据库 + private static final List SYSTEM_DATABASES = Arrays.asList( + "information_schema", "mysql", "performance_schema", "sys", "test" + ); + + // 提取字段长度的正则表达式（如varchar(50) -> 50） + private static final Pattern LENGTH_PATTERN = Pattern.compile("\\((\\d+)\\)"); + + /** + * 封装：获取MySQL数据库连接 + */ + private static Connection getConnection(String ip, Integer port, String username, String password) throws Exception { + String driver = "com.mysql.cj.jdbc.Driver"; + String jdbcUrl = String.format( + "jdbc:mysql://%s:%d/information_schema?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true", + ip, port + ); + Class.forName(driver); // 加载驱动 + return DriverManager.getConnection(jdbcUrl, username, password); + } + + /** + * 获取指定MySQL连接的所有非系统库表结构信息 + * + * @return 数据库名 -> 表信息列表（包含字段）的映射 + * @throws Exception 连接或查询异常 + */ + public static Map> getMysqlSchemaInfo(Connection conn) throws Exception { + Map> result = new HashMap<>(); + // 1. 获取所有非系统数据库 + List databases = getNonSystemDatabases(conn); + logger.info("获取到非系统数据库数量：", databases.size()); + // 2. 遍历数据库，获取表和字段信息 + for (String dbName : databases) { + List tableInfos = getTablesByDatabase(conn, dbName); + result.put(dbName, tableInfos); + } + return result; + } + + /** + * 获取所有非系统数据库 + */ + private static List getNonSystemDatabases(Connection conn) throws SQLException { + List databases = new ArrayList<>(); + String sql = "SELECT SCHEMA_NAME FROM SCHEMATA WHERE SCHEMA_NAME NOT IN (" + + String.join(",", Collections.nCopies(SYSTEM_DATABASES.size(), "?")) + ")"; + try (PreparedStatement ps = conn.prepareStatement(sql)) { + for (int i = 0; i < SYSTEM_DATABASES.size(); i++) { + ps.setString(i + 1, SYSTEM_DATABASES.get(i)); + } + try (ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + databases.add(rs.getString("SCHEMA_NAME")); + } + } + } + return databases; + } + + /** + * 获取指定数据库下的所有表信息（包含字段） + */ + private static List getTablesByDatabase(Connection conn, String dbName) throws SQLException { + List tableInfos = new ArrayList<>(); + String tableSql = "SELECT " + + "TABLE_NAME, TABLE_COMMENT, CREATE_TIME, UPDATE_TIME, " + + "DATA_LENGTH, INDEX_LENGTH, TABLE_ROWS " + + "FROM TABLES WHERE TABLE_SCHEMA = ?"; + try (PreparedStatement tablePs = conn.prepareStatement(tableSql)) { + tablePs.setString(1, dbName); + try (ResultSet tableRs = tablePs.executeQuery()) { + while (tableRs.next()) { + DataTableInfo tableInfo = buildDataTableInfo(tableRs, dbName); + List fields = getFieldsByTable(conn, dbName, tableInfo.getDataName()); + fields.forEach(field -> field.setTableId(tableInfo.getTableId())); + tableInfos.add(tableInfo); + } + } + } + return tableInfos; + } + + /** + * 构建DataTableInfo实体 + */ + private static DataTableInfo buildDataTableInfo(ResultSet tableRs, String dbName) throws SQLException { + DataTableInfo tableInfo = new DataTableInfo(); + tableInfo.setTableId(vId.getUid()); + tableInfo.setDataName(tableRs.getString("TABLE_NAME")); + tableInfo.setTableComment(tableRs.getString("TABLE_COMMENT")); + long dataLength = tableRs.getLong("DATA_LENGTH"); + long indexLength = tableRs.getLong("INDEX_LENGTH"); + BigDecimal tableSize = BigDecimal.valueOf((dataLength + indexLength) / 1024.0 / 1024.0) + .setScale(2, RoundingMode.HALF_UP); + tableInfo.setTableSize(tableSize); + tableInfo.setDataSource(dbName); + tableInfo.setDataRows(tableRs.getLong("TABLE_ROWS")); + String createDate = tableRs.getString("CREATE_TIME"); + tableInfo.setCreateTime(createDate != null ? createDate : vDate.getNow()); + String updateDate = tableRs.getString("UPDATE_TIME"); + tableInfo.setUpdateTime(updateDate != null ? updateDate : vDate.getNow()); + tableInfo.setDs(vDate.dsValue()); + return tableInfo; + } + + /** + * 获取指定表的字段信息 + */ + private static List getFieldsByTable(Connection conn, String dbName, String tableName) throws SQLException { + List fields = new ArrayList<>(); + String fieldSql = "SELECT " + + "TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE, COLUMN_TYPE, COLUMN_COMMENT, " + + "ORDINAL_POSITION, CHARACTER_MAXIMUM_LENGTH " + + "FROM COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? " + + "ORDER BY ORDINAL_POSITION"; + try (PreparedStatement fieldPs = conn.prepareStatement(fieldSql)) { + fieldPs.setString(1, dbName); + fieldPs.setString(2, tableName); + try (ResultSet fieldRs = fieldPs.executeQuery()) { + while (fieldRs.next()) { + fields.add(buildDataTableField(fieldRs)); + } + } + } + return fields; + } + + /** + * 构建DataTableField实体 + */ + private static DataTableField buildDataTableField(ResultSet fieldRs) throws SQLException { + DataTableField field = new DataTableField(); + field.setFieldId(vId.getUid()); + field.setDataSource(fieldRs.getString("TABLE_SCHEMA")); + field.setDataName(fieldRs.getString("TABLE_NAME")); + field.setFieldName(fieldRs.getString("COLUMN_NAME")); + field.setFieldType(fieldRs.getString("DATA_TYPE")); + field.setFieldOrder(fieldRs.getInt("ORDINAL_POSITION")); + field.setFieldRemark(fieldRs.getString("COLUMN_COMMENT")); + Long length = fieldRs.getLong("CHARACTER_MAXIMUM_LENGTH"); + if (length == 0 || fieldRs.wasNull()) { + length = extractLengthFromType(fieldRs.getString("COLUMN_TYPE")); + } + field.setFieldLength(length); + field.setCreateTime(LocalDateTime.now()); + field.setDs(vDate.dsValue()); + return field; + } + + /** + * 从字段类型中提取长度（如int(11) -> 11） + */ + private static Long extractLengthFromType(String fieldType) { + if (fieldType == null) return null; + Matcher matcher = LENGTH_PATTERN.matcher(fieldType); + if (matcher.find()) { + try { + return Long.parseLong(matcher.group(1)); + } catch (NumberFormatException e) { + logger.warn("提取字段长度失败，类型", fieldType, e); + } + } + return null; + } + + public static List getTableTrees(BizDbConfig dbConfig) { + List tableTrees = new ArrayList<>(); + try { + Connection conn = getConnection(dbConfig.getDbIp(), dbConfig.getDbPort(), dbConfig.getDbUsername(), dbConfig.getDbPassword()); + Map> schemaInfo = MysqlUtils.getMysqlSchemaInfo(conn); + for (Map.Entry> entry : schemaInfo.entrySet()) { + for (DataTableInfo tableInfo : entry.getValue()) { + tableInfo.setDbId(dbConfig.getId()); + List dataTableFields = getFieldsByTable(conn, entry.getKey(), tableInfo.getDataName()); + dataTableFields.stream().forEach(tableField -> tableField.setTableId(tableInfo.getTableId())); + tableTrees.add(new TableTree(tableInfo, dataTableFields)); + } + } + } catch (Exception e) { + logger.error(e.getMessage()); + } + return tableTrees; + } +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/SqlUtils.java b/web-api/src/main/java/com/jeesite/modules/app/utils/SqlUtils.java new file mode 100644 index 00000000..03f3a1fc --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/SqlUtils.java @@ -0,0 +1,97 @@ +package com.jeesite.modules.app.utils; + + +import com.jeesite.modules.app.dao.DataTableField; +import com.jeesite.modules.app.dao.DataTableInfo; + +import java.util.List; + +public class SqlUtils { + + + /** + * 生成CREATE TABLE语句 + * + * @param tableInfo 数据表基础信息 + * @param fieldList 字段列表 + * @return CREATE TABLE语句 + */ + public static String CreateTableSql(DataTableInfo tableInfo, List fieldList) { + StringBuilder sb = new StringBuilder(); + // 表定义开始 + sb.append("CREATE TABLE ").append(tableInfo.getDataName()).append(" (\n"); + // 拼接字段定义 + for (int i = 0; i < fieldList.size(); i++) { + DataTableField field = fieldList.get(i); + sb.append(" ").append(field.getFieldName()).append(" "); + // 处理字段类型和长度 + if (field.getFieldLength() != null && field.getFieldLength() > 0) { + sb.append(field.getFieldType()).append("(").append(field.getFieldLength()).append(") "); + } else { + sb.append(field.getFieldType()).append(" "); + } + // 处理主键（简单判断：fieldId为主键字段） + if ("field_id".equals(field.getFieldName()) || "table_id".equals(field.getFieldName())) { + sb.append("NOT NULL AUTO_INCREMENT "); + } else { + sb.append("DEFAULT NULL "); + } + + // 字段注释 + if (field.getFieldRemark() != null && !field.getFieldRemark().isEmpty()) { + sb.append("COMMENT '").append(field.getFieldRemark()).append("'"); + } + + // 最后一个字段不加逗号 + if (i != fieldList.size() - 1) { + sb.append(","); + } + sb.append("\n"); + } + // 表引擎和字符集 + sb.append(") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 "); + // 表注释 + if (tableInfo.getTableComment() != null && !tableInfo.getTableComment().isEmpty()) { + sb.append("COMMENT\t'").append(tableInfo.getTableComment()).append("'"); + } + sb.append(";"); + + return sb.toString(); + } + + /** + * 生成带注释的SELECT语句 + * + * @param tableInfo 数据表基础信息 + * @param fieldList 字段列表 + * @return 带注释的SELECT语句 + */ + public static String SelectSqlComments(DataTableInfo tableInfo, List fieldList) { + StringBuilder sb = new StringBuilder(); + // 表注释 + sb.append("-- 表名：").append(tableInfo.getDataName()).append("\n"); + sb.append("-- 描述：").append(tableInfo.getTableComment() != null ? tableInfo.getTableComment() : "无").append("\n"); + sb.append("-- 数据来源：").append(tableInfo.getDataSource() != null ? tableInfo.getDataSource() : "未知").append("\n"); + // SELECT语句开始 + sb.append("SELECT\n"); + // 拼接字段（带注释） + for (int i = 0; i < fieldList.size(); i++) { + DataTableField field = fieldList.get(i); + // 拼接字段名 + sb.append(" ").append(field.getFieldName()); + // 非最后一个字段加逗号（先处理逗号） + if (i != fieldList.size() - 1) { + sb.append(","); + } + // 处理字段注释（后加注释） + if (field.getFieldRemark() != null && !field.getFieldRemark().isEmpty()) { + sb.append(" -- ").append(field.getFieldRemark()); + } + // 换行 + sb.append("\n"); + } + // 表名 + sb.append("FROM ").append(tableInfo.getDataName()).append("\n;"); + return sb.toString(); + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java b/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java new file mode 100644 index 00000000..48311c7d --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java @@ -0,0 +1,114 @@ +package com.jeesite.modules.app.utils; + + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Date; +import java.util.Locale; + +public class vDate { + + + private static final DateTimeFormatter DEFAULT_FMT = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + private static final SimpleDateFormat DEFAULT_SDF = + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.ENGLISH); + + + private static final DateTimeFormatter DAY_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; // yyyy-MM-dd + private static final DateTimeFormatter MONTH_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM"); // yyyy-MM + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + + public static String toStr(LocalDateTime dateTime) { + return dateTime.format(DEFAULT_FMT); + } + + /** + * LocalDateTime → String（自定义格式） + */ + public static String toStr(LocalDateTime dateTime, String pattern) { + return dateTime.format(DateTimeFormatter.ofPattern(pattern)); + } + + public static String getNow() { + Date date = new Date(); + return DEFAULT_SDF.format(date); + } + + /** + * 获取更新时间 + */ + public static Date getUpdateTime(boolean isNew) { + if (isNew) { + return null; + } + return new Date(); + } + + + + + public static String dsValue() { + LocalDate currentDate = LocalDate.now(); + // 格式化日期为yyyymmdd + return currentDate.format(DATE_FORMATTER); + } + + + public static String dsValueDaysAgo(long days) { + LocalDate targetDate = LocalDate.now().minusDays(days); + return targetDate.format(DATE_FORMATTER); + } + + public static String getDockerCreate(String createAt) { + try { + String cleaned = createAt.replace(" CST", ""); + // 定义格式 + Date date = sdf.parse(cleaned); + return DEFAULT_SDF.format(date); + } catch (Exception e) { + System.out.println(e.getMessage()); + return getNow(); + } + } + + + public static String getRunTimes(long totalSeconds) { + if (totalSeconds < 0) { + throw new IllegalArgumentException("输入的秒数不能为负数"); + } + // 定义时间单位换算关系 + long secondsPerMinute = 60; + long secondsPerHour = secondsPerMinute * 60; // 3600秒/小时 + long secondsPerDay = secondsPerHour * 24; // 86400秒/天 + + // 计算各单位数值 + long days = totalSeconds / secondsPerDay; + long remainingSecondsAfterDays = totalSeconds % secondsPerDay; + + long hours = remainingSecondsAfterDays / secondsPerHour; + long remainingSecondsAfterHours = remainingSecondsAfterDays % secondsPerHour; + + long minutes = remainingSecondsAfterHours / secondsPerMinute; + long seconds = remainingSecondsAfterHours % secondsPerMinute; + // 拼接结果字符串 + StringBuilder result = new StringBuilder(); + if (days > 0) { + result.append(days).append("天"); + } + if (hours > 0) { + result.append(hours).append("小时"); + } + if (minutes > 0) { + result.append(minutes).append("分"); + } + // 确保至少显示秒数（即使其他单位都为0） + result.append(seconds).append("秒"); + return result.toString(); + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/vId.java b/web-api/src/main/java/com/jeesite/modules/app/utils/vId.java new file mode 100644 index 00000000..a596096f --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/vId.java @@ -0,0 +1,35 @@ +package com.jeesite.modules.app.utils; + +import java.security.SecureRandom; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +public class vId { + + private static final SecureRandom RAND = new SecureRandom(); + private static final DateTimeFormatter DF = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); + + private vId() {} + + + /** + * + * 时间戳唯一编号 + */ + public static String getUid() { + // 17 位时间 + String tm = LocalDateTime.now().format(DF); + // 25 位随机数字（高位补零） + long rand = Math.abs(RAND.nextLong()) % (long) Math.pow(10, 15); + return tm + String.format("%015d", rand); + } + + + public static String getCid() { + // 17 位时间 + String tm = LocalDateTime.now().format(DF); + // 25 位随机数字（高位补零） + long rand = Math.abs(RAND.nextLong()) % (long) Math.pow(3, 6); + return tm + String.format("%04d", rand); + } +} diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/vo.java b/web-api/src/main/java/com/jeesite/modules/app/utils/vo.java index 1ab892ec..69e99bdb 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/utils/vo.java +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/vo.java @@ -2,7 +2,6 @@ package com.jeesite.modules.app.utils; import com.jeesite.common.codec.AesUtils; -import java.util.Date; public class vo { @@ -39,16 +38,4 @@ public class vo { return s; } } - - - /** - * 获取更新时间 - */ - public static Date getUpdateTime(boolean isNew) { - if (isNew) { - return null; - } - return new Date(); - } - } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/dao/BizDbConfigDao.java b/web-api/src/main/java/com/jeesite/modules/biz/dao/BizDbConfigDao.java new file mode 100644 index 00000000..66aab157 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/dao/BizDbConfigDao.java @@ -0,0 +1,15 @@ +package com.jeesite.modules.biz.dao; + +import com.jeesite.common.dao.CrudDao; +import com.jeesite.common.mybatis.annotation.MyBatisDao; +import com.jeesite.modules.biz.entity.BizDbConfig; + +/** + * 连接信息DAO接口 + * @author gaoxq + * @version 2025-12-01 + */ +@MyBatisDao(dataSourceName="work") +public interface BizDbConfigDao extends CrudDao { + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/dao/BizTableInfoDao.java b/web-api/src/main/java/com/jeesite/modules/biz/dao/BizTableInfoDao.java new file mode 100644 index 00000000..0b04dbd2 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/dao/BizTableInfoDao.java @@ -0,0 +1,15 @@ +package com.jeesite.modules.biz.dao; + +import com.jeesite.common.dao.CrudDao; +import com.jeesite.common.mybatis.annotation.MyBatisDao; +import com.jeesite.modules.biz.entity.BizTableInfo; + +/** + * 数据信息DAO接口 + * @author gaoxq + * @version 2025-12-01 + */ +@MyBatisDao(dataSourceName="work") +public interface BizTableInfoDao extends CrudDao { + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDbConfig.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDbConfig.java new file mode 100644 index 00000000..21d97ce5 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizDbConfig.java @@ -0,0 +1,110 @@ +package com.jeesite.modules.biz.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.jeesite.common.mybatis.annotation.JoinTable; +import com.jeesite.common.mybatis.annotation.JoinTable.Type; +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; + +import com.jeesite.common.entity.DataEntity; +import com.jeesite.common.mybatis.annotation.Column; +import com.jeesite.common.mybatis.annotation.Table; +import com.jeesite.common.mybatis.mapper.query.QueryType; +import com.jeesite.common.utils.excel.annotation.ExcelField; +import com.jeesite.common.utils.excel.annotation.ExcelField.Align; +import com.jeesite.common.utils.excel.annotation.ExcelFields; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 连接信息Entity + * + * @author gaoxq + * @version 2025-12-01 + */ +@EqualsAndHashCode(callSuper = true) +@Table(name = "biz_db_config", alias = "a", label = "连接信息信息", columns = { + @Column(name = "create_time", attrName = "createTime", label = "创建时间", isUpdate = false, isUpdateForce = true), + @Column(name = "id", attrName = "id", label = "主键ID", isPK = true), + @Column(name = "db_type", attrName = "dbType", label = "数据库类型"), + @Column(name = "db_name", attrName = "dbName", label = "数据库名称", queryType = QueryType.LIKE), + @Column(name = "db_ip", attrName = "dbIp", label = "数据库IP"), + @Column(name = "db_port", attrName = "dbPort", label = "数据库端口", isQuery = false), + @Column(name = "db_username", attrName = "dbUsername", label = "数据库账号", isQuery = false), + @Column(name = "db_password", attrName = "dbPassword", label = "数据库密码", isQuery = false), + @Column(name = "description", attrName = "description", label = "数据库描述", queryType = QueryType.LIKE), + @Column(name = "is_enabled", attrName = "isEnabled", label = "是否启用"), + @Column(name = "db_schema_name", attrName = "dbSchemaName", label = "schema名称", isQuery = false), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true), + @Column(name = "f_tenant_id", attrName = "ftenantId", label = "租户id", isUpdate = false, isQuery = false), + @Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false), + @Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false), + @Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true), +}, orderBy = "a.id DESC" +) +@Data +public class BizDbConfig extends DataEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + private Date createTime; // 创建时间 + private String dbType; // 数据库类型 + private String dbName; // 数据库名称 + private String dbIp; // 数据库IP + private Integer dbPort; // 数据库端口 + private String dbUsername; // 数据库账号 + private String dbPassword; // 数据库密码 + private String description; // 数据库描述 + private String isEnabled; // 是否启用 + private String dbSchemaName; // schema名称 + private Date updateTime; // 更新时间 + private String ftenantId; // 租户id + private String fflowId; // 流程id + private String fflowTaskId; // 流程任务主键 + private Integer fflowState; // 流程任务状态 + + @ExcelFields({ + @ExcelField(title = "创建时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "主键ID", attrName = "id", align = Align.CENTER, sort = 20), + @ExcelField(title = "数据库类型", attrName = "dbType", align = Align.CENTER, sort = 30), + @ExcelField(title = "数据库名称", attrName = "dbName", align = Align.CENTER, sort = 40), + @ExcelField(title = "数据库IP", attrName = "dbIp", align = Align.CENTER, sort = 50), + @ExcelField(title = "数据库端口", attrName = "dbPort", align = Align.CENTER, sort = 60), + @ExcelField(title = "数据库账号", attrName = "dbUsername", align = Align.CENTER, sort = 70), + @ExcelField(title = "数据库密码", attrName = "dbPassword", align = Align.CENTER, sort = 80), + @ExcelField(title = "数据库描述", attrName = "description", align = Align.CENTER, sort = 90), + @ExcelField(title = "是否启用", attrName = "isEnabled", dictType = "is_active", align = Align.CENTER, sort = 100), + @ExcelField(title = "schema名称", attrName = "dbSchemaName", align = Align.CENTER, sort = 110), + @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 120, dataFormat = "yyyy-MM-dd hh:mm"), + }) + public BizDbConfig() { + this(null); + } + + public BizDbConfig(String id) { + super(id); + } + + public Date getCreateTime_gte() { + return sqlMap.getWhere().getValue("create_time", QueryType.GTE); + } + + public void setCreateTime_gte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); + } + + public Date getCreateTime_lte() { + return sqlMap.getWhere().getValue("create_time", QueryType.LTE); + } + + public void setCreateTime_lte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizTableInfo.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizTableInfo.java new file mode 100644 index 00000000..42d6ccfa --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizTableInfo.java @@ -0,0 +1,119 @@ +package com.jeesite.modules.biz.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.jeesite.common.mybatis.annotation.JoinTable; +import com.jeesite.common.mybatis.annotation.JoinTable.Type; +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +import com.jeesite.common.entity.DataEntity; +import com.jeesite.common.mybatis.annotation.Column; +import com.jeesite.common.mybatis.annotation.Table; +import com.jeesite.common.mybatis.mapper.query.QueryType; +import com.jeesite.common.utils.excel.annotation.ExcelField; +import com.jeesite.common.utils.excel.annotation.ExcelField.Align; +import com.jeesite.common.utils.excel.annotation.ExcelFields; +import lombok.Data; + +import java.io.Serial; + +/** + * 数据信息Entity + * + * @author gaoxq + * @version 2025-12-01 + */ +@Table(name = "biz_table_info", alias = "a", label = "数据信息信息", columns = { + @Column(name = "create_time", attrName = "createTime", label = "创建时间", isUpdate = false, isUpdateForce = true), + @Column(name = "table_id", attrName = "tableId", label = "唯一标识", isPK = true), + @Column(name = "data_name", attrName = "dataName", label = "数据表名称", queryType = QueryType.LIKE), + @Column(name = "table_comment", attrName = "tableComment", label = "数据表描述", queryType = QueryType.LIKE), + @Column(name = "table_size", attrName = "tableSize", label = "数据表大小", isQuery = false, isUpdateForce = true), + @Column(name = "data_source", attrName = "dataSource", label = "数据来源"), + @Column(name = "creator", attrName = "creator", label = "创建人员", isQuery = false), + @Column(name = "data_rows", attrName = "dataRows", label = "记录条数", isQuery = false, isUpdateForce = true), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true), + @Column(name = "remarks", attrName = "remarks", label = "备注信息", queryType = QueryType.LIKE), + @Column(name = "db_id", attrName = "dbId", label = "数据标识"), + @Column(name = "ds", attrName = "ds", label = "分区日期"), + @Column(name = "f_tenant_id", attrName = "ftenantId", label = "租户id", isUpdate = false, isQuery = false), + @Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false), + @Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false), + @Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true), +}, joinTable = { + @JoinTable(type = Type.LEFT_JOIN, entity = BizDbConfig.class, attrName = "this", alias = "b", + on = "a.db_id = b.id", + columns = { + @Column(name = "db_type", attrName = "dbType", label = "数据库类型"), + @Column(name = "db_name", attrName = "dbName", label = "数据库名称"), + @Column(name = "db_ip", attrName = "dbIp", label = "数据库IP"), + }), +}, orderBy = "a.create_time DESC" +) +@Data +public class BizTableInfo extends DataEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + private Date createTime; // 创建时间 + private String tableId; // 唯一标识 + private String dataName; // 数据表名称 + private String tableComment; // 数据表描述 + private Double tableSize; // 数据表大小 + private String dataSource; // 数据来源 + private String creator; // 创建人员 + private Long dataRows; // 记录条数 + private Date updateTime; // 更新时间 + private String dbId; // 数据标识 + private String ds; // 分区日期 + private String ftenantId; // 租户id + private String fflowId; // 流程id + private String fflowTaskId; // 流程任务主键 + private Integer fflowState; // 流程任务状态 + + private String dbType; + private String dbName; + private String dbIp; + + @ExcelFields({ + @ExcelField(title = "创建时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "唯一标识", attrName = "tableId", align = Align.CENTER, sort = 20), + @ExcelField(title = "数据表名称", attrName = "dataName", align = Align.CENTER, sort = 30), + @ExcelField(title = "数据表描述", attrName = "tableComment", align = Align.CENTER, sort = 40), + @ExcelField(title = "数据表大小", attrName = "tableSize", align = Align.CENTER, sort = 50), + @ExcelField(title = "数据来源", attrName = "dataSource", align = Align.CENTER, sort = 60), + @ExcelField(title = "创建人员", attrName = "creator", align = Align.CENTER, sort = 70), + @ExcelField(title = "记录条数", attrName = "dataRows", align = Align.CENTER, sort = 80), + @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 90, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "备注信息", attrName = "remarks", align = Align.CENTER, sort = 100), + @ExcelField(title = "数据库名称", attrName = "dbName", align = Align.CENTER, sort = 110), + @ExcelField(title = "分区日期", attrName = "ds", align = Align.CENTER, sort = 120), + }) + public BizTableInfo() { + this(null); + } + + public BizTableInfo(String id) { + super(id); + } + + public Date getCreateTime_gte() { + return sqlMap.getWhere().getValue("create_time", QueryType.GTE); + } + + public void setCreateTime_gte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); + } + + public Date getCreateTime_lte() { + return sqlMap.getWhere().getValue("create_time", QueryType.LTE); + } + + public void setCreateTime_lte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/service/BizDbConfigService.java b/web-api/src/main/java/com/jeesite/modules/biz/service/BizDbConfigService.java new file mode 100644 index 00000000..858171c2 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/service/BizDbConfigService.java @@ -0,0 +1,134 @@ +package com.jeesite.modules.biz.service; + +import java.util.List; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.jeesite.common.entity.Page; +import com.jeesite.common.service.CrudService; +import com.jeesite.modules.biz.entity.BizDbConfig; +import com.jeesite.modules.biz.dao.BizDbConfigDao; +import com.jeesite.common.service.ServiceException; +import com.jeesite.common.config.Global; +import com.jeesite.common.validator.ValidatorUtils; +import com.jeesite.common.utils.excel.ExcelImport; +import org.springframework.web.multipart.MultipartFile; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; + +/** + * 连接信息Service + * @author gaoxq + * @version 2025-12-01 + */ +@Service +public class BizDbConfigService extends CrudService { + + /** + * 获取单条数据 + * @param bizDbConfig 主键 + */ + @Override + public BizDbConfig get(BizDbConfig bizDbConfig) { + return super.get(bizDbConfig); + } + + /** + * 查询分页数据 + * @param bizDbConfig 查询条件 + * @param bizDbConfig page 分页对象 + */ + @Override + public Page findPage(BizDbConfig bizDbConfig) { + return super.findPage(bizDbConfig); + } + + /** + * 查询列表数据 + * @param bizDbConfig 查询条件 + */ + @Override + public List findList(BizDbConfig bizDbConfig) { + return super.findList(bizDbConfig); + } + + /** + * 保存数据（插入或更新） + * @param bizDbConfig 数据对象 + */ + @Override + @Transactional + public void save(BizDbConfig bizDbConfig) { + super.save(bizDbConfig); + } + + /** + * 导入数据 + * @param file 导入的数据文件 + */ + @Transactional + public String importData(MultipartFile file) { + if (file == null){ + throw new ServiceException(text("请选择导入的数据文件！")); + } + int successNum = 0; int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + try(ExcelImport ei = new ExcelImport(file, 2, 0)){ + List list = ei.getDataList(BizDbConfig.class); + for (BizDbConfig bizDbConfig : list) { + try{ + ValidatorUtils.validateWithException(bizDbConfig); + this.save(bizDbConfig); + successNum++; + successMsg.append("
" + successNum + "、编号 " + bizDbConfig.getId() + " 导入成功"); + } catch (Exception e) { + failureNum++; + String msg = "
" + failureNum + "、编号 " + bizDbConfig.getId() + " 导入失败："; + if (e instanceof ConstraintViolationException){ + ConstraintViolationException cve = (ConstraintViolationException)e; + for (ConstraintViolation violation : cve.getConstraintViolations()) { + msg += Global.getText(violation.getMessage()) + " ("+violation.getPropertyPath()+")"; + } + }else{ + msg += e.getMessage(); + } + failureMsg.append(msg); + logger.error(msg, e); + } + } + } catch (Exception e) { + logger.error(e.getMessage(), e); + failureMsg.append(e.getMessage()); + return failureMsg.toString(); + } + if (failureNum > 0) { + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + throw new ServiceException(failureMsg.toString()); + }else{ + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + } + return successMsg.toString(); + } + + /** + * 更新状态 + * @param bizDbConfig 数据对象 + */ + @Override + @Transactional + public void updateStatus(BizDbConfig bizDbConfig) { + super.updateStatus(bizDbConfig); + } + + /** + * 删除数据 + * @param bizDbConfig 数据对象 + */ + @Override + @Transactional + public void delete(BizDbConfig bizDbConfig) { + super.delete(bizDbConfig); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/service/BizTableInfoService.java b/web-api/src/main/java/com/jeesite/modules/biz/service/BizTableInfoService.java new file mode 100644 index 00000000..b171bace --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/service/BizTableInfoService.java @@ -0,0 +1,134 @@ +package com.jeesite.modules.biz.service; + +import java.util.List; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.jeesite.common.entity.Page; +import com.jeesite.common.service.CrudService; +import com.jeesite.modules.biz.entity.BizTableInfo; +import com.jeesite.modules.biz.dao.BizTableInfoDao; +import com.jeesite.common.service.ServiceException; +import com.jeesite.common.config.Global; +import com.jeesite.common.validator.ValidatorUtils; +import com.jeesite.common.utils.excel.ExcelImport; +import org.springframework.web.multipart.MultipartFile; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; + +/** + * 数据信息Service + * @author gaoxq + * @version 2025-12-01 + */ +@Service +public class BizTableInfoService extends CrudService { + + /** + * 获取单条数据 + * @param bizTableInfo 主键 + */ + @Override + public BizTableInfo get(BizTableInfo bizTableInfo) { + return super.get(bizTableInfo); + } + + /** + * 查询分页数据 + * @param bizTableInfo 查询条件 + * @param bizTableInfo page 分页对象 + */ + @Override + public Page findPage(BizTableInfo bizTableInfo) { + return super.findPage(bizTableInfo); + } + + /** + * 查询列表数据 + * @param bizTableInfo 查询条件 + */ + @Override + public List findList(BizTableInfo bizTableInfo) { + return super.findList(bizTableInfo); + } + + /** + * 保存数据（插入或更新） + * @param bizTableInfo 数据对象 + */ + @Override + @Transactional + public void save(BizTableInfo bizTableInfo) { + super.save(bizTableInfo); + } + + /** + * 导入数据 + * @param file 导入的数据文件 + */ + @Transactional + public String importData(MultipartFile file) { + if (file == null){ + throw new ServiceException(text("请选择导入的数据文件！")); + } + int successNum = 0; int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + try(ExcelImport ei = new ExcelImport(file, 2, 0)){ + List list = ei.getDataList(BizTableInfo.class); + for (BizTableInfo bizTableInfo : list) { + try{ + ValidatorUtils.validateWithException(bizTableInfo); + this.save(bizTableInfo); + successNum++; + successMsg.append("
" + successNum + "、编号 " + bizTableInfo.getId() + " 导入成功"); + } catch (Exception e) { + failureNum++; + String msg = "
" + failureNum + "、编号 " + bizTableInfo.getId() + " 导入失败："; + if (e instanceof ConstraintViolationException){ + ConstraintViolationException cve = (ConstraintViolationException)e; + for (ConstraintViolation violation : cve.getConstraintViolations()) { + msg += Global.getText(violation.getMessage()) + " ("+violation.getPropertyPath()+")"; + } + }else{ + msg += e.getMessage(); + } + failureMsg.append(msg); + logger.error(msg, e); + } + } + } catch (Exception e) { + logger.error(e.getMessage(), e); + failureMsg.append(e.getMessage()); + return failureMsg.toString(); + } + if (failureNum > 0) { + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + throw new ServiceException(failureMsg.toString()); + }else{ + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + } + return successMsg.toString(); + } + + /** + * 更新状态 + * @param bizTableInfo 数据对象 + */ + @Override + @Transactional + public void updateStatus(BizTableInfo bizTableInfo) { + super.updateStatus(bizTableInfo); + } + + /** + * 删除数据 + * @param bizTableInfo 数据对象 + */ + @Override + @Transactional + public void delete(BizTableInfo bizTableInfo) { + super.delete(bizTableInfo); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java new file mode 100644 index 00000000..4c1898ac --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizDbConfigController.java @@ -0,0 +1,149 @@ +package com.jeesite.modules.biz.web; + +import java.util.List; + +import com.jeesite.modules.app.utils.vDate; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.jeesite.common.config.Global; +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.entity.Page; +import com.jeesite.common.lang.DateUtils; +import com.jeesite.common.utils.excel.ExcelExport; +import com.jeesite.common.utils.excel.annotation.ExcelField.Type; +import org.springframework.web.multipart.MultipartFile; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.biz.entity.BizDbConfig; +import com.jeesite.modules.biz.service.BizDbConfigService; + +/** + * 连接信息Controller + * @author gaoxq + * @version 2025-12-01 + */ +@Controller +@RequestMapping(value = "${adminPath}/biz/dbConfig") +public class BizDbConfigController extends BaseController { + + private final BizDbConfigService bizDbConfigService; + + public BizDbConfigController(BizDbConfigService bizDbConfigService) { + this.bizDbConfigService = bizDbConfigService; + } + + /** + * 获取数据 + */ + @ModelAttribute + public BizDbConfig get(String id, boolean isNewRecord) { + return bizDbConfigService.get(id, isNewRecord); + } + + /** + * 查询列表 + */ + @RequiresPermissions("biz:dbConfig:view") + @RequestMapping(value = {"list", ""}) + public String list(BizDbConfig bizDbConfig, Model model) { + model.addAttribute("bizDbConfig", bizDbConfig); + return "modules/biz/bizDbConfigList"; + } + + /** + * 查询列表数据 + */ + @RequiresPermissions("biz:dbConfig:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(BizDbConfig bizDbConfig, HttpServletRequest request, HttpServletResponse response) { + bizDbConfig.setPage(new Page<>(request, response)); + Page page = bizDbConfigService.findPage(bizDbConfig); + return page; + } + + /** + * 查看编辑表单 + */ + @RequiresPermissions("biz:dbConfig:view") + @RequestMapping(value = "form") + public String form(BizDbConfig bizDbConfig, Model model) { + model.addAttribute("bizDbConfig", bizDbConfig); + return "modules/biz/bizDbConfigForm"; + } + + /** + * 保存数据 + */ + @RequiresPermissions("biz:dbConfig:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated BizDbConfig bizDbConfig) { + bizDbConfig.setUpdateTime(vDate.getUpdateTime(bizDbConfig.getIsNewRecord())); + bizDbConfigService.save(bizDbConfig); + return renderResult(Global.TRUE, text("保存连接信息成功！")); + } + + /** + * 导出数据 + */ + @RequiresPermissions("biz:dbConfig:view") + @RequestMapping(value = "exportData") + public void exportData(BizDbConfig bizDbConfig, HttpServletResponse response) { + List list = bizDbConfigService.findList(bizDbConfig); + String fileName = "连接信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + try(ExcelExport ee = new ExcelExport("连接信息", BizDbConfig.class)){ + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 下载模板 + */ + @RequiresPermissions("biz:dbConfig:view") + @RequestMapping(value = "importTemplate") + public void importTemplate(HttpServletResponse response) { + BizDbConfig bizDbConfig = new BizDbConfig(); + List list = ListUtils.newArrayList(bizDbConfig); + String fileName = "连接信息模板.xlsx"; + try(ExcelExport ee = new ExcelExport("连接信息", BizDbConfig.class, Type.IMPORT)){ + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 导入数据 + */ + @ResponseBody + @RequiresPermissions("biz:dbConfig:edit") + @PostMapping(value = "importData") + public String importData(MultipartFile file) { + try { + String message = bizDbConfigService.importData(file); + return renderResult(Global.TRUE, "posfull:"+message); + } catch (Exception ex) { + return renderResult(Global.FALSE, "posfull:"+ex.getMessage()); + } + } + + /** + * 删除数据 + */ + @RequiresPermissions("biz:dbConfig:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(BizDbConfig bizDbConfig) { + bizDbConfigService.delete(bizDbConfig); + return renderResult(Global.TRUE, text("删除连接信息成功！")); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java index a6cbbbb1..80819e34 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizMonitorHostController.java @@ -2,7 +2,7 @@ package com.jeesite.modules.biz.web; import java.util.List; -import com.jeesite.modules.app.utils.vo; +import com.jeesite.modules.app.utils.vDate; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -89,7 +89,7 @@ public class BizMonitorHostController extends BaseController { @PostMapping(value = "save") @ResponseBody public String save(@Validated BizMonitorHost bizMonitorHost) { - bizMonitorHost.setUpdateTime(vo.getUpdateTime(bizMonitorHost.getIsNewRecord())); + bizMonitorHost.setUpdateTime(vDate.getUpdateTime(bizMonitorHost.getIsNewRecord())); bizMonitorHostService.save(bizMonitorHost); return renderResult(Global.TRUE, text("保存主机信息成功！")); } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizTableInfoController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizTableInfoController.java new file mode 100644 index 00000000..0e5ff1f9 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizTableInfoController.java @@ -0,0 +1,150 @@ +package com.jeesite.modules.biz.web; + +import java.util.List; + +import com.jeesite.modules.app.utils.vDate; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.jeesite.common.config.Global; +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.entity.Page; +import com.jeesite.common.lang.DateUtils; +import com.jeesite.common.utils.excel.ExcelExport; +import com.jeesite.common.utils.excel.annotation.ExcelField.Type; +import org.springframework.web.multipart.MultipartFile; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.biz.entity.BizTableInfo; +import com.jeesite.modules.biz.service.BizTableInfoService; + +/** + * 数据信息Controller + * + * @author gaoxq + * @version 2025-12-01 + */ +@Controller +@RequestMapping(value = "${adminPath}/biz/tableInfo") +public class BizTableInfoController extends BaseController { + + private final BizTableInfoService bizTableInfoService; + + public BizTableInfoController(BizTableInfoService bizTableInfoService) { + this.bizTableInfoService = bizTableInfoService; + } + + /** + * 获取数据 + */ + @ModelAttribute + public BizTableInfo get(String tableId, boolean isNewRecord) { + return bizTableInfoService.get(tableId, isNewRecord); + } + + /** + * 查询列表 + */ + @RequiresPermissions("biz:tableInfo:view") + @RequestMapping(value = {"list", ""}) + public String list(BizTableInfo bizTableInfo, Model model) { + model.addAttribute("bizTableInfo", bizTableInfo); + return "modules/biz/bizTableInfoList"; + } + + /** + * 查询列表数据 + */ + @RequiresPermissions("biz:tableInfo:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(BizTableInfo bizTableInfo, HttpServletRequest request, HttpServletResponse response) { + bizTableInfo.setDs(vDate.dsValue()); + bizTableInfo.setPage(new Page<>(request, response)); + Page page = bizTableInfoService.findPage(bizTableInfo); + return page; + } + + /** + * 查看编辑表单 + */ + @RequiresPermissions("biz:tableInfo:view") + @RequestMapping(value = "form") + public String form(BizTableInfo bizTableInfo, Model model) { + model.addAttribute("bizTableInfo", bizTableInfo); + return "modules/biz/bizTableInfoForm"; + } + + /** + * 保存数据 + */ + @RequiresPermissions("biz:tableInfo:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated BizTableInfo bizTableInfo) { + bizTableInfoService.save(bizTableInfo); + return renderResult(Global.TRUE, text("保存数据信息成功！")); + } + + /** + * 导出数据 + */ + @RequiresPermissions("biz:tableInfo:view") + @RequestMapping(value = "exportData") + public void exportData(BizTableInfo bizTableInfo, HttpServletResponse response) { + List list = bizTableInfoService.findList(bizTableInfo); + String fileName = "数据信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + try (ExcelExport ee = new ExcelExport("数据信息", BizTableInfo.class)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 下载模板 + */ + @RequiresPermissions("biz:tableInfo:view") + @RequestMapping(value = "importTemplate") + public void importTemplate(HttpServletResponse response) { + BizTableInfo bizTableInfo = new BizTableInfo(); + List list = ListUtils.newArrayList(bizTableInfo); + String fileName = "数据信息模板.xlsx"; + try (ExcelExport ee = new ExcelExport("数据信息", BizTableInfo.class, Type.IMPORT)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 导入数据 + */ + @ResponseBody + @RequiresPermissions("biz:tableInfo:edit") + @PostMapping(value = "importData") + public String importData(MultipartFile file) { + try { + String message = bizTableInfoService.importData(file); + return renderResult(Global.TRUE, "posfull:" + message); + } catch (Exception ex) { + return renderResult(Global.FALSE, "posfull:" + ex.getMessage()); + } + } + + /** + * 删除数据 + */ + @RequiresPermissions("biz:tableInfo:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(BizTableInfo bizTableInfo) { + bizTableInfoService.delete(bizTableInfo); + return renderResult(Global.TRUE, text("删除数据信息成功！")); + } + +} \ No newline at end of file diff --git a/web-api/src/main/resources/mappings/modules/biz/BizDbConfigDao.xml b/web-api/src/main/resources/mappings/modules/biz/BizDbConfigDao.xml new file mode 100644 index 00000000..aaafaf69 --- /dev/null +++ b/web-api/src/main/resources/mappings/modules/biz/BizDbConfigDao.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/web-api/src/main/resources/mappings/modules/biz/BizTableInfoDao.xml b/web-api/src/main/resources/mappings/modules/biz/BizTableInfoDao.xml new file mode 100644 index 00000000..bbacef96 --- /dev/null +++ b/web-api/src/main/resources/mappings/modules/biz/BizTableInfoDao.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/web-vue/packages/biz/api/biz/dbConfig.ts b/web-vue/packages/biz/api/biz/dbConfig.ts new file mode 100644 index 00000000..24cc0b54 --- /dev/null +++ b/web-vue/packages/biz/api/biz/dbConfig.ts @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * No deletion without permission, or be held responsible to law. + * @author gaoxq + */ +import { defHttp } from '@jeesite/core/utils/http/axios'; +import { useGlobSetting } from '@jeesite/core/hooks/setting'; +import { BasicModel, Page } from '@jeesite/core/api/model/baseModel'; +import { UploadApiResult } from '@jeesite/core/api/sys/upload'; +import { UploadFileParams } from '@jeesite/types/axios'; +import { AxiosProgressEvent } from 'axios'; + +const { ctxPath, adminPath } = useGlobSetting(); + +export interface BizDbConfig extends BasicModel { + createTime?: string; // 创建时间 + dbType: string; // 数据库类型 + dbName: string; // 数据库名称 + dbIp: string; // 数据库IP + dbPort: number; // 数据库端口 + dbUsername: string; // 数据库账号 + dbPassword: string; // 数据库密码 + description?: string; // 数据库描述 + isEnabled: number; // 是否启用 + dbSchemaName?: string; // schema名称 + updateTime?: string; // 更新时间 + ftenantId?: string; // 租户id + fflowId?: string; // 流程id + fflowTaskId?: string; // 流程任务主键 + fflowState?: number; // 流程任务状态 +} + +export const bizDbConfigList = (params?: BizDbConfig | any) => + defHttp.get({ url: adminPath + '/biz/dbConfig/list', params }); + +export const bizDbConfigListData = (params?: BizDbConfig | any) => + defHttp.post>({ url: adminPath + '/biz/dbConfig/listData', params }); + +export const bizDbConfigForm = (params?: BizDbConfig | any) => + defHttp.get({ url: adminPath + '/biz/dbConfig/form', params }); + +export const bizDbConfigSave = (params?: any, data?: BizDbConfig | any) => + defHttp.postJson({ url: adminPath + '/biz/dbConfig/save', params, data }); + +export const bizDbConfigImportData = ( + params: UploadFileParams, + onUploadProgress: (progressEvent: AxiosProgressEvent) => void, +) => + defHttp.uploadFile( + { + url: ctxPath + adminPath + '/biz/dbConfig/importData', + onUploadProgress, + }, + params, + ); + +export const bizDbConfigDelete = (params?: BizDbConfig | any) => + defHttp.get({ url: adminPath + '/biz/dbConfig/delete', params }); diff --git a/web-vue/packages/biz/api/biz/tableInfo.ts b/web-vue/packages/biz/api/biz/tableInfo.ts new file mode 100644 index 00000000..0e8cde5f --- /dev/null +++ b/web-vue/packages/biz/api/biz/tableInfo.ts @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * No deletion without permission, or be held responsible to law. + * @author gaoxq + */ +import { defHttp } from '@jeesite/core/utils/http/axios'; +import { useGlobSetting } from '@jeesite/core/hooks/setting'; +import { BasicModel, Page } from '@jeesite/core/api/model/baseModel'; +import { UploadApiResult } from '@jeesite/core/api/sys/upload'; +import { UploadFileParams } from '@jeesite/types/axios'; +import { AxiosProgressEvent } from 'axios'; + +const { ctxPath, adminPath } = useGlobSetting(); + +export interface BizTableInfo extends BasicModel { + createTime?: string; // 创建时间 + tableId?: string; // 唯一标识 + dataName: string; // 数据表名称 + tableComment: string; // 数据表描述 + tableSize?: number; // 数据表大小 + dataSource?: string; // 数据来源 + creator?: string; // 创建人员 + dataRows?: number; // 记录条数 + updateTime?: string; // 更新时间 + dbId?: string; // 数据标识 + ds?: string; // 分区日期 + ftenantId?: string; // 租户id + fflowId?: string; // 流程id + fflowTaskId?: string; // 流程任务主键 + fflowState?: number; // 流程任务状态 +} + +export const bizTableInfoList = (params?: BizTableInfo | any) => + defHttp.get({ url: adminPath + '/biz/tableInfo/list', params }); + +export const bizTableInfoListData = (params?: BizTableInfo | any) => + defHttp.post>({ url: adminPath + '/biz/tableInfo/listData', params }); + +export const bizTableInfoForm = (params?: BizTableInfo | any) => + defHttp.get({ url: adminPath + '/biz/tableInfo/form', params }); + +export const bizTableInfoSave = (params?: any, data?: BizTableInfo | any) => + defHttp.postJson({ url: adminPath + '/biz/tableInfo/save', params, data }); + +export const bizTableInfoImportData = ( + params: UploadFileParams, + onUploadProgress: (progressEvent: AxiosProgressEvent) => void, +) => + defHttp.uploadFile( + { + url: ctxPath + adminPath + '/biz/tableInfo/importData', + onUploadProgress, + }, + params, + ); + +export const bizTableInfoDelete = (params?: BizTableInfo | any) => + defHttp.get({ url: adminPath + '/biz/tableInfo/delete', params }); diff --git a/web-vue/packages/biz/views/biz/dbConfig/form.vue b/web-vue/packages/biz/views/biz/dbConfig/form.vue new file mode 100644 index 00000000..147b5ec1 --- /dev/null +++ b/web-vue/packages/biz/views/biz/dbConfig/form.vue @@ -0,0 +1,164 @@ + + + diff --git a/web-vue/packages/biz/views/biz/dbConfig/formImport.vue b/web-vue/packages/biz/views/biz/dbConfig/formImport.vue new file mode 100644 index 00000000..81379b24 --- /dev/null +++ b/web-vue/packages/biz/views/biz/dbConfig/formImport.vue @@ -0,0 +1,103 @@ + + + diff --git a/web-vue/packages/biz/views/biz/dbConfig/list.vue b/web-vue/packages/biz/views/biz/dbConfig/list.vue new file mode 100644 index 00000000..a5edfc1f --- /dev/null +++ b/web-vue/packages/biz/views/biz/dbConfig/list.vue @@ -0,0 +1,286 @@ + + + diff --git a/web-vue/packages/biz/views/biz/dbConfig/select.ts b/web-vue/packages/biz/views/biz/dbConfig/select.ts new file mode 100644 index 00000000..80ee622e --- /dev/null +++ b/web-vue/packages/biz/views/biz/dbConfig/select.ts @@ -0,0 +1,172 @@ +import { useI18n } from '@jeesite/core/hooks/web/useI18n'; +import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table'; +import { BizDbConfig, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig'; + +const { t } = useI18n('biz.dbConfig'); + +const modalProps = { + title: t('连接信息选择'), +}; + +const searchForm: FormProps = { + baseColProps: { md: 8, lg: 6 }, + labelWidth: 90, + schemas: [ + { + label: t('创建时间起'), + field: 'createTime_gte', + component: 'DatePicker', + componentProps: { + format: 'YYYY-MM-DD HH:mm', + showTime: { format: 'HH:mm' }, + }, + }, + { + label: t('创建时间止'), + field: 'createTime_lte', + component: 'DatePicker', + componentProps: { + format: 'YYYY-MM-DD HH:mm', + showTime: { format: 'HH:mm' }, + }, + }, + { + label: t('数据库类型'), + field: 'dbType', + component: 'Select', + componentProps: { + dictType: 'db_type', + allowClear: true, + }, + }, + { + label: t('数据库名称'), + field: 'dbName', + component: 'Input', + }, + { + label: t('数据库IP'), + field: 'dbIp', + component: 'Input', + }, + { + label: t('数据库描述'), + field: 'description', + component: 'Input', + }, + { + label: t('是否启用'), + field: 'isEnabled', + component: 'Select', + componentProps: { + dictType: 'is_active', + allowClear: true, + }, + }, + ], +}; + +const tableColumns: BasicColumn[] = [ + { + title: t('创建时间'), + dataIndex: 'createTime', + key: 'a.create_time', + sorter: true, + width: 180, + align: 'left', + fixed: 'left' + }, + { + title: t('数据库类型'), + dataIndex: 'dbType', + key: 'a.db_type', + sorter: true, + width: 130, + align: 'left', + dictType: 'db_type', + }, + { + title: t('数据库名称'), + dataIndex: 'dbName', + key: 'a.db_name', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('数据库IP'), + dataIndex: 'dbIp', + key: 'a.db_ip', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('数据库端口'), + dataIndex: 'dbPort', + key: 'a.db_port', + sorter: true, + width: 130, + align: 'center', + }, + { + title: t('数据库账号'), + dataIndex: 'dbUsername', + key: 'a.db_username', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('数据库描述'), + dataIndex: 'description', + key: 'a.description', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('是否启用'), + dataIndex: 'isEnabled', + key: 'a.is_enabled', + sorter: true, + width: 130, + align: 'center', + dictType: 'is_active', + }, + { + title: t('schema名称'), + dataIndex: 'dbSchemaName', + key: 'a.db_schema_name', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('更新时间'), + dataIndex: 'updateTime', + key: 'a.update_time', + sorter: true, + width: 180, + align: 'center', + }, +]; + +const tableProps: BasicTableProps = { + api: bizDbConfigListData, + beforeFetch: (params) => { + params['isAll'] = true; + return params; + }, + columns: tableColumns, + formConfig: searchForm, + rowKey: 'id', +}; + +export default { + modalProps, + tableProps, + itemCode: 'id', + itemName: 'dbName', + isShowCode: true, +}; diff --git a/web-vue/packages/biz/views/biz/deviceInfo/list.vue b/web-vue/packages/biz/views/biz/deviceInfo/list.vue index 6437d174..8f754d4c 100644 --- a/web-vue/packages/biz/views/biz/deviceInfo/list.vue +++ b/web-vue/packages/biz/views/biz/deviceInfo/list.vue @@ -16,7 +16,6 @@ - diff --git a/web-vue/packages/biz/views/biz/deviceInfo/select.ts b/web-vue/packages/biz/views/biz/deviceInfo/select.ts deleted file mode 100644 index 95d3e1f3..00000000 --- a/web-vue/packages/biz/views/biz/deviceInfo/select.ts +++ /dev/null @@ -1,126 +0,0 @@ -import { useI18n } from '@jeesite/core/hooks/web/useI18n'; -import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table'; -import { bizDeviceInfoListData } from '@jeesite/biz/api/biz/deviceInfo'; - -const { t } = useI18n('biz.deviceInfo'); - -const modalProps = { - title: t('磁盘信息选择'), -}; - -const searchForm: FormProps = { - baseColProps: { md: 8, lg: 6 }, - labelWidth: 90, - schemas: [ - { - label: t('记录时间起'), - field: 'createTime_gte', - component: 'DatePicker', - componentProps: { - format: 'YYYY-MM-DD HH:mm', - showTime: { format: 'HH:mm' }, - }, - }, - { - label: t('记录时间止'), - field: 'createTime_lte', - component: 'DatePicker', - componentProps: { - format: 'YYYY-MM-DD HH:mm', - showTime: { format: 'HH:mm' }, - }, - }, - { - label: t('主机标识'), - field: 'hostId', - component: 'Input', - }, - ], -}; - -const tableColumns: BasicColumn[] = [ - { - title: t('记录时间'), - dataIndex: 'createTime', - key: 'a.create_time', - sorter: true, - width: 230, - align: 'left', - slot: 'firstColumn', - }, - { - title: t('设备名称'), - dataIndex: 'device', - key: 'a.device', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('挂载点'), - dataIndex: 'mountPoint', - key: 'a.mount_point', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('总容量'), - dataIndex: 'totalSize', - key: 'a.total_size', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('已使用容量'), - dataIndex: 'usedSize', - key: 'a.used_size', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('使用率'), - dataIndex: 'usageRate', - key: 'a.usage_rate', - sorter: true, - width: 130, - align: 'right', - }, - { - title: t('最后一次检测时间'), - dataIndex: 'lastOnlineTime', - key: 'a.last_online_time', - sorter: true, - width: 130, - align: 'center', - }, - { - title: t('主机标识'), - dataIndex: 'hostId', - key: 'a.host_id', - sorter: true, - width: 130, - align: 'left', - }, -]; - -const tableProps: BasicTableProps = { - api: bizDeviceInfoListData, - beforeFetch: (params) => { - params['isAll'] = true; - return params; - }, - columns: tableColumns, - formConfig: searchForm, - rowKey: 'id', -}; - -export default { - modalProps, - tableProps, - itemCode: 'id', - itemName: 'id', - isShowCode: false, -}; diff --git a/web-vue/packages/biz/views/biz/serverInfo/list.vue b/web-vue/packages/biz/views/biz/serverInfo/list.vue index 4c5004b9..88e0ea2e 100644 --- a/web-vue/packages/biz/views/biz/serverInfo/list.vue +++ b/web-vue/packages/biz/views/biz/serverInfo/list.vue @@ -16,7 +16,6 @@ - diff --git a/web-vue/packages/biz/views/biz/serverInfo/select.ts b/web-vue/packages/biz/views/biz/serverInfo/select.ts deleted file mode 100644 index 83fe387f..00000000 --- a/web-vue/packages/biz/views/biz/serverInfo/select.ts +++ /dev/null @@ -1,178 +0,0 @@ -import { useI18n } from '@jeesite/core/hooks/web/useI18n'; -import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table'; -import { bizServerInfoListData } from '@jeesite/biz/api/biz/serverInfo'; - -const { t } = useI18n('biz.serverInfo'); - -const modalProps = { - title: t('运行信息选择'), -}; - -const searchForm: FormProps = { - baseColProps: { md: 8, lg: 6 }, - labelWidth: 90, - schemas: [ - { - label: t('记录时间起'), - field: 'createTime_gte', - component: 'DatePicker', - componentProps: { - format: 'YYYY-MM-DD HH:mm', - showTime: { format: 'HH:mm' }, - }, - }, - { - label: t('记录时间止'), - field: 'createTime_lte', - component: 'DatePicker', - componentProps: { - format: 'YYYY-MM-DD HH:mm', - showTime: { format: 'HH:mm' }, - }, - }, - { - label: t('内核版本'), - field: 'kernelVersion', - component: 'Input', - }, - { - label: t('主机名称'), - field: 'hostname', - component: 'Input', - }, - { - label: t('主机地址'), - field: 'ipAddress', - component: 'Input', - }, - { - label: t('CPU型号'), - field: 'cpuModel', - component: 'Input', - }, - { - label: t('主机标识'), - field: 'hostId', - component: 'Input', - }, - ], -}; - -const tableColumns: BasicColumn[] = [ - { - title: t('记录时间'), - dataIndex: 'createTime', - key: 'a.create_time', - sorter: true, - width: 230, - align: 'left', - slot: 'firstColumn', - }, - { - title: t('主机运行时间'), - dataIndex: 'uptime', - key: 'a.uptime', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('操作系统'), - dataIndex: 'os', - key: 'a.os', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('内核版本'), - dataIndex: 'kernelVersion', - key: 'a.kernel_version', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('主机名称'), - dataIndex: 'hostname', - key: 'a.hostname', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('主机地址'), - dataIndex: 'ipAddress', - key: 'a.ip_address', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('CPU型号'), - dataIndex: 'cpuModel', - key: 'a.cpu_model', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('内存总量'), - dataIndex: 'memoryTotal', - key: 'a.memory_total', - sorter: true, - width: 130, - align: 'left', - }, - { - title: t('CPU使用率'), - dataIndex: 'cpuUsage', - key: 'a.cpu_usage', - sorter: true, - width: 130, - align: 'right', - }, - { - title: t('内存使用率'), - dataIndex: 'memoryUsage', - key: 'a.memory_usage', - sorter: true, - width: 130, - align: 'right', - }, - { - title: t('最后一次检测时间'), - dataIndex: 'lastOnlineTime', - key: 'a.last_online_time', - sorter: true, - width: 130, - align: 'center', - }, - { - title: t('主机标识'), - dataIndex: 'hostId', - key: 'a.host_id', - sorter: true, - width: 130, - align: 'left', - }, -]; - -const tableProps: BasicTableProps = { - api: bizServerInfoListData, - beforeFetch: (params) => { - params['isAll'] = true; - return params; - }, - columns: tableColumns, - formConfig: searchForm, - rowKey: 'id', -}; - -export default { - modalProps, - tableProps, - itemCode: 'id', - itemName: 'id', - isShowCode: false, -}; diff --git a/web-vue/packages/biz/views/biz/tableInfo/formImport.vue b/web-vue/packages/biz/views/biz/tableInfo/formImport.vue new file mode 100644 index 00000000..cd6c0615 --- /dev/null +++ b/web-vue/packages/biz/views/biz/tableInfo/formImport.vue @@ -0,0 +1,103 @@ + + + diff --git a/web-vue/packages/biz/views/biz/tableInfo/list.vue b/web-vue/packages/biz/views/biz/tableInfo/list.vue new file mode 100644 index 00000000..53fff2ac --- /dev/null +++ b/web-vue/packages/biz/views/biz/tableInfo/list.vue @@ -0,0 +1,271 @@ + + + diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/bizCompSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/bizCompSelect.ts index 0178467a..bc8cd0ac 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/bizCompSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizCompSelect.ts @@ -70,7 +70,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', - slot: 'firstColumn', + fixed: 'left', }, { title: t('公司名称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/bizDbSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/bizDbSelect.ts new file mode 100644 index 00000000..80ee622e --- /dev/null +++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizDbSelect.ts @@ -0,0 +1,172 @@ +import { useI18n } from '@jeesite/core/hooks/web/useI18n'; +import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table'; +import { BizDbConfig, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig'; + +const { t } = useI18n('biz.dbConfig'); + +const modalProps = { + title: t('连接信息选择'), +}; + +const searchForm: FormProps = { + baseColProps: { md: 8, lg: 6 }, + labelWidth: 90, + schemas: [ + { + label: t('创建时间起'), + field: 'createTime_gte', + component: 'DatePicker', + componentProps: { + format: 'YYYY-MM-DD HH:mm', + showTime: { format: 'HH:mm' }, + }, + }, + { + label: t('创建时间止'), + field: 'createTime_lte', + component: 'DatePicker', + componentProps: { + format: 'YYYY-MM-DD HH:mm', + showTime: { format: 'HH:mm' }, + }, + }, + { + label: t('数据库类型'), + field: 'dbType', + component: 'Select', + componentProps: { + dictType: 'db_type', + allowClear: true, + }, + }, + { + label: t('数据库名称'), + field: 'dbName', + component: 'Input', + }, + { + label: t('数据库IP'), + field: 'dbIp', + component: 'Input', + }, + { + label: t('数据库描述'), + field: 'description', + component: 'Input', + }, + { + label: t('是否启用'), + field: 'isEnabled', + component: 'Select', + componentProps: { + dictType: 'is_active', + allowClear: true, + }, + }, + ], +}; + +const tableColumns: BasicColumn[] = [ + { + title: t('创建时间'), + dataIndex: 'createTime', + key: 'a.create_time', + sorter: true, + width: 180, + align: 'left', + fixed: 'left' + }, + { + title: t('数据库类型'), + dataIndex: 'dbType', + key: 'a.db_type', + sorter: true, + width: 130, + align: 'left', + dictType: 'db_type', + }, + { + title: t('数据库名称'), + dataIndex: 'dbName', + key: 'a.db_name', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('数据库IP'), + dataIndex: 'dbIp', + key: 'a.db_ip', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('数据库端口'), + dataIndex: 'dbPort', + key: 'a.db_port', + sorter: true, + width: 130, + align: 'center', + }, + { + title: t('数据库账号'), + dataIndex: 'dbUsername', + key: 'a.db_username', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('数据库描述'), + dataIndex: 'description', + key: 'a.description', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('是否启用'), + dataIndex: 'isEnabled', + key: 'a.is_enabled', + sorter: true, + width: 130, + align: 'center', + dictType: 'is_active', + }, + { + title: t('schema名称'), + dataIndex: 'dbSchemaName', + key: 'a.db_schema_name', + sorter: true, + width: 130, + align: 'left', + }, + { + title: t('更新时间'), + dataIndex: 'updateTime', + key: 'a.update_time', + sorter: true, + width: 180, + align: 'center', + }, +]; + +const tableProps: BasicTableProps = { + api: bizDbConfigListData, + beforeFetch: (params) => { + params['isAll'] = true; + return params; + }, + columns: tableColumns, + formConfig: searchForm, + rowKey: 'id', +}; + +export default { + modalProps, + tableProps, + itemCode: 'id', + itemName: 'dbName', + isShowCode: true, +}; diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/bizEmpSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/bizEmpSelect.ts index 366f3642..329d225c 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/bizEmpSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizEmpSelect.ts @@ -73,7 +73,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', - slot: 'firstColumn', + fixed: 'left', }, { title: t('员工姓名'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/bizHostSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/bizHostSelect.ts index 34c52a5a..0a593512 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/bizHostSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizHostSelect.ts @@ -74,6 +74,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', + fixed: 'left', }, { title: t('主机名称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/bizProjectSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/bizProjectSelect.ts index e7ab9e15..c4ba3916 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/bizProjectSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizProjectSelect.ts @@ -42,7 +42,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', - slot: 'firstColumn', + fixed: 'left', }, { title: t('项目编码'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/bizProvSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/bizProvSelect.ts index e7ce8621..a1b7d10a 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/bizProvSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/bizProvSelect.ts @@ -42,6 +42,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', + fixed: 'left', }, { title: t('省份名称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/empUserSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/empUserSelect.ts index dd9b533e..0e1a17d6 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/empUserSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/empUserSelect.ts @@ -82,7 +82,7 @@ const tableColumns: BasicColumn[] = [ key: 'a.login_code', sorter: true, width: 100, - slot: 'firstColumn', + fixed: 'left', }, { title: t('用户昵称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/erpAccountSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/erpAccountSelect.ts index 46d65ab8..b1d595f5 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/erpAccountSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/erpAccountSelect.ts @@ -42,6 +42,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', + fixed: 'left', }, { title: t('账户名称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/erpCategorySelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/erpCategorySelect.ts index 010228e2..3bdb6404 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/erpCategorySelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/erpCategorySelect.ts @@ -46,6 +46,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', + fixed: 'left', }, { title: t('分类名称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/erpFlowSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/erpFlowSelect.ts index 6d48bd0b..58120ead 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/erpFlowSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/erpFlowSelect.ts @@ -46,7 +46,7 @@ const tableColumns: BasicColumn[] = [ sorter: true, width: 180, align: 'left', - slot: 'firstColumn', + fixed: 'left', }, { title: t('交易名称'), diff --git a/web-vue/packages/core/components/ListSelect/src/selectType/userSelect.ts b/web-vue/packages/core/components/ListSelect/src/selectType/userSelect.ts index 8e2ef537..80867c5b 100644 --- a/web-vue/packages/core/components/ListSelect/src/selectType/userSelect.ts +++ b/web-vue/packages/core/components/ListSelect/src/selectType/userSelect.ts @@ -60,7 +60,7 @@ const tableColumns: BasicColumn[] = [ key: 'a.login_code', sorter: true, width: 100, - slot: 'firstColumn', + fixed: 'left', }, { title: t('用户昵称'),