lbqms.git - Gitblit

			@@ -29,7 +29,6 @@
			import org.dromara.common.json.utils.JsonUtils;
			import org.dromara.common.mybatis.core.page.PageQuery;
			import org.dromara.common.mybatis.core.page.TableDataInfo;
			import org.dromara.common.satoken.utils.LoginHelper;
			import org.dromara.generator.constant.GenConstants;
			import org.dromara.generator.domain.GenTable;
			import org.dromara.generator.domain.GenTableColumn;
			@@ -64,7 +63,7 @@
			private final GenTableColumnMapper genTableColumnMapper;
			private final IdentifierGenerator identifierGenerator;

			private static final String[] TABLE_IGNORE = new String[]{"sj_", "act_", "flw_", "gen_"};
			private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"};

			/**
			* 查询业务字段列表
			@@ -106,7 +105,8 @@
			.like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName()))
			.like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
			.between(params.get("beginTime") != null && params.get("endTime") != null,
			"create_time", params.get("beginTime"), params.get("endTime"));
			"create_time", params.get("beginTime"), params.get("endTime"))
			.orderByDesc("update_time");
			return wrapper;
			}

			@@ -137,7 +137,7 @@
			}
			// 过滤并转换表格数据
			List<GenTable> tables = tablesMap.values().stream()
			.filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
			.filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
			.filter(x -> {
			if (CollUtil.isEmpty(tableNames)) {
			return true;
			@@ -162,10 +162,12 @@
			GenTable gen = new GenTable();
			gen.setTableName(x.getName());
			gen.setTableComment(x.getComment());
			gen.setCreateTime(x.getCreateTime());
			// postgresql的表元数据没有创建时间这个东西(好奇葩) 只能new Date代替
			gen.setCreateTime(ObjectUtil.defaultIfNull(x.getCreateTime(), new Date()));
			gen.setUpdateTime(x.getUpdateTime());
			return gen;
			}).toList();
			}).sorted(Comparator.comparing(GenTable::getCreateTime).reversed())
			.toList();

			IPage<GenTable> page = pageQuery.build();
			page.setTotal(tables.size());
			@@ -192,7 +194,7 @@
			}

			List<Table<?>> tableList = tablesMap.values().stream()
			.filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
			.filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
			.filter(x -> tableNameSet.contains(x.getName())).toList();

			if (CollUtil.isEmpty(tableList)) {
			@@ -259,11 +261,10 @@
			@DSTransactional
			@Override
			public void importGenTable(List<GenTable> tableList, String dataName) {
			Long operId = LoginHelper.getUserId();
			try {
			for (GenTable table : tableList) {
			String tableName = table.getTableName();
			GenUtils.initTable(table, operId);
			GenUtils.initTable(table);
			table.setDataName(dataName);
			int row = baseMapper.insert(table);
			if (row > 0) {
			@@ -294,14 +295,18 @@
			@DS("#dataName")
			@Override
			public List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName) {
			LinkedHashMap<String, Column> columns = ServiceProxy.metadata().columns(tableName);
			Table<?> table = ServiceProxy.metadata().table(tableName);
			if (ObjectUtil.isNull(table)) {
			return new ArrayList<>();
			}
			LinkedHashMap<String, Column> columns = table.getColumns();
			List<GenTableColumn> tableColumns = new ArrayList<>();
			columns.forEach((columnName, column) -> {
			GenTableColumn tableColumn = new GenTableColumn();
			tableColumn.setIsPk(String.valueOf(column.isPrimaryKey()));
			tableColumn.setColumnName(column.getName());
			tableColumn.setColumnComment(column.getComment());
			tableColumn.setColumnType(column.getTypeName().toLowerCase());
			tableColumn.setColumnType(column.getOriginType().toLowerCase());
			tableColumn.setSort(column.getPosition());
			tableColumn.setIsRequired(column.isNullable() == 0 ? "1" : "0");
			tableColumn.setIsIncrement(column.isAutoIncrement() == -1 ? "0" : "1");
			@@ -548,7 +553,7 @@
			String treeCode = paramsObj.getStr(GenConstants.TREE_CODE);
			String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE);
			String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
			String parentMenuId = paramsObj.getStr(GenConstants.PARENT_MENU_ID);
			Long parentMenuId = paramsObj.getLong(GenConstants.PARENT_MENU_ID);
			String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME);

			genTable.setTreeCode(treeCode);