From 91c7b46d524c9df6800e0fdf5e41118030d03809 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 三月 2022 13:00:53 +0800
Subject: [PATCH] add 增加 postgresql 主sql脚本
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 304 +++++++++++++++++++-------------------------------
1 files changed, 118 insertions(+), 186 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 5fcdd3b..f957009 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -1,19 +1,19 @@
package com.ruoyi.generator.service;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.io.IoUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.GenConstants;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
@@ -22,23 +22,18 @@
import com.ruoyi.generator.util.GenUtils;
import com.ruoyi.generator.util.VelocityInitializer;
import com.ruoyi.generator.util.VelocityUtils;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+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;
@@ -46,14 +41,28 @@
/**
* 涓氬姟 鏈嶅姟灞傚疄鐜�
*
- * @author ruoyi
+ * @author Lion Li
*/
@Slf4j
+@RequiredArgsConstructor
@Service
-public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTable> implements IGenTableService {
+public class GenTableServiceImpl extends BaseGenTableServiceImpl {
- @Autowired
- private GenTableColumnMapper genTableColumnMapper;
+ private final GenTableMapper baseMapper;
+ private final GenTableColumnMapper genTableColumnMapper;
+
+ /**
+ * 鏌ヨ涓氬姟瀛楁鍒楄〃
+ *
+ * @param tableId 涓氬姟瀛楁缂栧彿
+ * @return 涓氬姟瀛楁闆嗗悎
+ */
+ @Override
+ public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
+ return genTableColumnMapper.selectList(new LambdaQueryWrapper<GenTableColumn>()
+ .eq(GenTableColumn::getTableId, tableId)
+ .orderByAsc(GenTableColumn::getSort));
+ }
/**
* 鏌ヨ涓氬姟淇℃伅
@@ -69,13 +78,9 @@
}
@Override
- public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable) {
- return PageUtils.buildDataInfo(baseMapper.selectPageGenTableList(PageUtils.buildPage(), genTable));
- }
-
- @Override
- public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable) {
- return PageUtils.buildDataInfo(baseMapper.selectPageDbTableList(PageUtils.buildPage(), genTable));
+ public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
+ Page<GenTable> page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
+ return TableDataInfo.build(page);
}
/**
@@ -86,7 +91,24 @@
*/
@Override
public List<GenTable> selectGenTableList(GenTable genTable) {
- return baseMapper.selectGenTableList(genTable);
+ return baseMapper.selectList(this.buildGenTableQueryWrapper(genTable));
+ }
+
+ private QueryWrapper<GenTable> buildGenTableQueryWrapper(GenTable genTable) {
+ Map<String, Object> params = genTable.getParams();
+ QueryWrapper<GenTable> wrapper = Wrappers.query();
+ wrapper.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"));
+ return wrapper;
+ }
+
+
+ @Override
+ public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
+ Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), this.buildDbTableQueryWrapper(genTable));
+ return TableDataInfo.build(page);
}
/**
@@ -97,7 +119,22 @@
*/
@Override
public List<GenTable> selectDbTableList(GenTable genTable) {
- return baseMapper.selectDbTableList(genTable);
+ return baseMapper.selectDbTableList(this.buildDbTableQueryWrapper(genTable));
+ }
+
+ private Wrapper<Object> buildDbTableQueryWrapper(GenTable genTable) {
+ Map<String, Object> params = genTable.getParams();
+ QueryWrapper<Object> wrapper = Wrappers.query();
+ wrapper.apply("table_schema = (select database())")
+ .notLike("table_name", "xxl_job_")
+ .notLike("table_name", "gen_")
+ .notInSql("table_name", "select table_name from gen_table")
+ .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"))
+ .orderByDesc("create_time");
+ return wrapper;
}
/**
@@ -128,23 +165,13 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public void updateGenTable(GenTable genTable) {
String options = JsonUtils.toJsonString(genTable.getParams());
genTable.setOptions(options);
int row = baseMapper.updateById(genTable);
if (row > 0) {
for (GenTableColumn cenTableColumn : genTable.getColumns()) {
- genTableColumnMapper.update(cenTableColumn,
- new LambdaUpdateWrapper<GenTableColumn>()
- .set(cenTableColumn.getIsPk() == null, GenTableColumn::getIsPk, null)
- .set(cenTableColumn.getIsIncrement() == null, GenTableColumn::getIsIncrement, null)
- .set(cenTableColumn.getIsInsert() == null, GenTableColumn::getIsInsert, null)
- .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
- .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
- .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
- .set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
- .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
+ genTableColumnMapper.updateById(cenTableColumn);
}
}
}
@@ -156,10 +183,9 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public void deleteGenTableByIds(Long[] tableIds) {
List<Long> ids = Arrays.asList(tableIds);
- removeByIds(ids);
+ baseMapper.deleteBatchIds(ids);
genTableColumnMapper.delete(new LambdaQueryWrapper<GenTableColumn>().in(GenTableColumn::getTableId, ids));
}
@@ -169,9 +195,8 @@
* @param tableList 瀵煎叆琛ㄥ垪琛�
*/
@Override
- @Transactional
public void importGenTable(List<GenTable> tableList) {
- String operName = SecurityUtils.getUsername();
+ String operName = LoginHelper.getUsername();
try {
for (GenTable table : tableList) {
String tableName = table.getTableName();
@@ -180,14 +205,18 @@
if (row > 0) {
// 淇濆瓨鍒椾俊鎭�
List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+ List<GenTableColumn> saveColumns = new ArrayList<>();
for (GenTableColumn column : genTableColumns) {
GenUtils.initColumnField(column, table);
+ saveColumns.add(column);
}
- genTableColumnMapper.insertAll(genTableColumns);
- }
+ if (CollUtil.isNotEmpty(saveColumns)) {
+ genTableColumnMapper.insertBatch(saveColumns);
+ }
+ }
}
} catch (Exception e) {
- throw new CustomException("瀵煎叆澶辫触锛�" + e.getMessage());
+ throw new ServiceException("瀵煎叆澶辫触锛�" + e.getMessage());
}
}
@@ -223,21 +252,6 @@
}
/**
- * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
- *
- * @param tableName 琛ㄥ悕绉�
- * @return 鏁版嵁
- */
- @Override
- public byte[] downloadCode(String tableName) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- ZipOutputStream zip = new ZipOutputStream(outputStream);
- generatorCode(tableName, zip);
- IOUtils.closeQuietly(zip);
- return outputStream.toByteArray();
- }
-
- /**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*
* @param tableName 琛ㄥ悕绉�
@@ -258,13 +272,17 @@
// 鑾峰彇妯℃澘鍒楄〃
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates) {
- if (!StrUtil.containsAny("sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm", template)) {
+ if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
// 娓叉煋妯℃澘
StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8);
tpl.merge(context, sw);
- String path = getGenPath(table, template);
- FileUtils.writeUtf8String(sw.toString(), path);
+ try {
+ String path = getGenPath(table, template);
+ FileUtils.writeUtf8String(sw.toString(), path);
+ } catch (Exception e) {
+ throw new ServiceException("娓叉煋妯℃澘澶辫触锛岃〃鍚嶏細" + table.getTableName());
+ }
}
}
}
@@ -275,24 +293,43 @@
* @param tableName 琛ㄥ悕绉�
*/
@Override
- @Transactional
public void synchDb(String tableName) {
GenTable table = baseMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns();
- List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+ Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
- if (Validator.isEmpty(dbTableColumns)) {
- throw new CustomException("鍚屾鏁版嵁澶辫触锛屽師琛ㄧ粨鏋勪笉瀛樺湪");
+ if (CollUtil.isEmpty(dbTableColumns)) {
+ throw new ServiceException("鍚屾鏁版嵁澶辫触锛屽師琛ㄧ粨鏋勪笉瀛樺湪");
}
List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+ List<GenTableColumn> saveColumns = new ArrayList<>();
dbTableColumns.forEach(column -> {
- if (!tableColumnNames.contains(column.getColumnName())) {
- GenUtils.initColumnField(column, table);
- }
- });
- genTableColumnMapper.insertAll(tableColumns);
+ GenUtils.initColumnField(column, table);
+ if (tableColumnMap.containsKey(column.getColumnName())) {
+ GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
+ column.setColumnId(prevColumn.getColumnId());
+ if (column.isList()) {
+ // 濡傛灉鏄垪琛紝缁х画淇濈暀鏌ヨ鏂瑰紡/瀛楀吀绫诲瀷閫夐」
+ column.setDictType(prevColumn.getDictType());
+ column.setQueryType(prevColumn.getQueryType());
+ }
+ if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
+ && (column.isInsert() || column.isEdit())
+ && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
+ // 濡傛灉鏄�(鏂板/淇敼&闈炰富閿�/闈炲拷鐣ュ強鐖跺睘鎬�)锛岀户缁繚鐣欏繀濉�/鏄剧ず绫诲瀷閫夐」
+ column.setIsRequired(prevColumn.getIsRequired());
+ column.setHtmlType(prevColumn.getHtmlType());
+ }
+ genTableColumnMapper.updateById(column);
+ } else {
+ genTableColumnMapper.insert(column);
+ }
+ });
+ if (CollUtil.isNotEmpty(saveColumns)) {
+ genTableColumnMapper.insertBatch(saveColumns);
+ }
List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(delColumns)) {
@@ -302,26 +339,10 @@
}
/**
- * 鎵归噺鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
- *
- * @param tableNames 琛ㄦ暟缁�
- * @return 鏁版嵁
- */
- @Override
- public byte[] downloadCode(String[] tableNames) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- ZipOutputStream zip = new ZipOutputStream(outputStream);
- for (String tableName : tableNames) {
- generatorCode(tableName, zip);
- }
- IOUtils.closeQuietly(zip);
- return outputStream.toByteArray();
- }
-
- /**
* 鏌ヨ琛ㄤ俊鎭苟鐢熸垚浠ｇ爜
*/
- private void generatorCode(String tableName, ZipOutputStream zip) {
+ @Override
+ public void generatorCode(String tableName, ZipOutputStream zip) {
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableByName(tableName);
// 璁剧疆涓诲瓙琛ㄤ俊鎭�
@@ -343,65 +364,12 @@
try {
// 娣诲姞鍒皕ip
zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
- IOUtils.write(sw.toString(), zip, Constants.UTF8);
- IOUtils.closeQuietly(sw);
+ IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
+ IoUtil.close(sw);
zip.flush();
zip.closeEntry();
} catch (IOException e) {
log.error("娓叉煋妯℃澘澶辫触锛岃〃鍚嶏細" + table.getTableName(), e);
- }
- }
- }
-
- /**
- * 淇敼淇濆瓨鍙傛暟鏍￠獙
- *
- * @param genTable 涓氬姟淇℃伅
- */
- @Override
- public void validateEdit(GenTable genTable) {
- if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
- Map<String, Object> paramsObj = genTable.getParams();
- if (Validator.isEmpty(paramsObj.get(GenConstants.TREE_CODE))) {
- throw new CustomException("鏍戠紪鐮佸瓧娈典笉鑳戒负绌�");
- } else if (Validator.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
- throw new CustomException("鏍戠埗缂栫爜瀛楁涓嶈兘涓虹┖");
- } else if (Validator.isEmpty(paramsObj.get(GenConstants.TREE_NAME))) {
- throw new CustomException("鏍戝悕绉板瓧娈典笉鑳戒负绌�");
- } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
- if (Validator.isEmpty(genTable.getSubTableName())) {
- throw new CustomException("鍏宠仈瀛愯〃鐨勮〃鍚嶄笉鑳戒负绌�");
- } else if (Validator.isEmpty(genTable.getSubTableFkName())) {
- throw new CustomException("瀛愯〃鍏宠仈鐨勫閿悕涓嶈兘涓虹┖");
- }
- }
- }
- }
-
- /**
- * 璁剧疆涓婚敭鍒椾俊鎭�
- *
- * @param table 涓氬姟琛ㄤ俊鎭�
- */
- public void setPkColumn(GenTable table) {
- for (GenTableColumn column : table.getColumns()) {
- if (column.isPk()) {
- table.setPkColumn(column);
- break;
- }
- }
- if (Validator.isNull(table.getPkColumn())) {
- table.setPkColumn(table.getColumns().get(0));
- }
- if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
- for (GenTableColumn column : table.getSubTable().getColumns()) {
- if (column.isPk()) {
- table.getSubTable().setPkColumn(column);
- break;
- }
- }
- if (Validator.isNull(table.getSubTable().getPkColumn())) {
- table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
}
}
}
@@ -413,45 +381,9 @@
*/
public void setSubTable(GenTable table) {
String subTableName = table.getSubTableName();
- if (Validator.isNotEmpty(subTableName)) {
+ if (StringUtils.isNotEmpty(subTableName)) {
table.setSubTable(baseMapper.selectGenTableByName(subTableName));
}
}
- /**
- * 璁剧疆浠ｇ爜鐢熸垚鍏朵粬閫夐」鍊�
- *
- * @param genTable 璁剧疆鍚庣殑鐢熸垚瀵硅薄
- */
- public void setTableFromOptions(GenTable genTable) {
- Map<String, Object> paramsObj = JsonUtils.parseMap(genTable.getOptions());
- if (Validator.isNotNull(paramsObj)) {
- String treeCode = Convert.toStr(paramsObj.get(GenConstants.TREE_CODE));
- String treeParentCode = Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE));
- String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
- String parentMenuId = Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
- String parentMenuName = Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_NAME));
-
- genTable.setTreeCode(treeCode);
- genTable.setTreeParentCode(treeParentCode);
- genTable.setTreeName(treeName);
- genTable.setParentMenuId(parentMenuId);
- genTable.setParentMenuName(parentMenuName);
- }
- }
-
- /**
- * 鑾峰彇浠ｇ爜鐢熸垚鍦板潃
- *
- * @param table 涓氬姟琛ㄤ俊鎭�
- * @param template 妯℃澘鏂囦欢璺緞
- * @return 鐢熸垚鍦板潃
- */
- public static String getGenPath(GenTable table, String template) {
- String genPath = table.getGenPath();
- if (StrUtil.equals(genPath, "/")) {
- return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
- }
- return genPath + File.separator + VelocityUtils.getFileName(template, table);
- }
}
--
Gitblit v1.9.3