lbqms.git - Gitblit

			@@ -18,6 +18,7 @@
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.helper.LoginHelper;
			import com.ruoyi.common.utils.JsonUtils;
			import com.ruoyi.common.utils.StreamUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.file.FileUtils;
			import com.ruoyi.generator.domain.GenTable;
			@@ -33,6 +34,7 @@
			import org.apache.velocity.VelocityContext;
			import org.apache.velocity.app.Velocity;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import java.io.ByteArrayOutputStream;
			import java.io.File;
			@@ -40,8 +42,6 @@
			import java.io.StringWriter;
			import java.nio.charset.StandardCharsets;
			import java.util.*;
			import java.util.function.Function;
			import java.util.stream.Collectors;
			import java.util.zip.ZipEntry;
			import java.util.zip.ZipOutputStream;

			@@ -91,17 +91,6 @@
			return TableDataInfo.build(page);
			}

			/**
			* 查询业务列表
			*
			* @param genTable 业务信息
			* @return 业务集合
			*/
			@Override
			public List<GenTable> selectGenTableList(GenTable genTable) {
			return baseMapper.selectList(this.buildGenTableQueryWrapper(genTable));
			}

			private QueryWrapper<GenTable> buildGenTableQueryWrapper(GenTable genTable) {
			Map<String, Object> params = genTable.getParams();
			QueryWrapper<GenTable> wrapper = Wrappers.query();
			@@ -117,17 +106,6 @@
			public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
			Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable);
			return TableDataInfo.build(page);
			}

			/**
			* 查询据库列表
			*
			* @param genTable 业务信息
			* @return 数据库表集合
			*/
			@Override
			public List<GenTable> selectDbTableList(GenTable genTable) {
			return baseMapper.selectDbTableList(genTable);
			}

			/**
			@@ -157,6 +135,7 @@
			* @param genTable 业务信息
			* @return 结果
			*/
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void updateGenTable(GenTable genTable) {
			String options = JsonUtils.toJsonString(genTable.getParams());
			@@ -175,6 +154,7 @@
			* @param tableIds 需要删除的数据ID
			* @return 结果
			*/
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void deleteGenTableByIds(Long[] tableIds) {
			List<Long> ids = Arrays.asList(tableIds);
			@@ -187,6 +167,7 @@
			*
			* @param tableList 导入表列表
			*/
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void importGenTable(List<GenTable> tableList) {
			String operName = LoginHelper.getUsername();
			@@ -306,17 +287,18 @@
			*
			* @param tableName 表名称
			*/
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void synchDb(String tableName) {
			GenTable table = baseMapper.selectGenTableByName(tableName);
			List<GenTableColumn> tableColumns = table.getColumns();
			Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
			Map<String, GenTableColumn> tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName);

			List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
			if (CollUtil.isEmpty(dbTableColumns)) {
			throw new ServiceException("同步数据失败，原表结构不存在");
			}
			List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
			List<String> dbTableColumnNames = StreamUtils.toList(dbTableColumns, GenTableColumn::getColumnName);

			List<GenTableColumn> saveColumns = new ArrayList<>();
			dbTableColumns.forEach(column -> {
			@@ -344,10 +326,9 @@
			if (CollUtil.isNotEmpty(saveColumns)) {
			genTableColumnMapper.insertBatch(saveColumns);
			}

			List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
			List<GenTableColumn> delColumns = StreamUtils.filter(tableColumns, column -> !dbTableColumnNames.contains(column.getColumnName()));
			if (CollUtil.isNotEmpty(delColumns)) {
			List<Long> ids = delColumns.stream().map(GenTableColumn::getColumnId).collect(Collectors.toList());
			List<Long> ids = StreamUtils.toList(delColumns, GenTableColumn::getColumnId);
			genTableColumnMapper.deleteBatchIds(ids);
			}
			}