From 8ee749f137987de436ccd869adc43f31979286e8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 04 三月 2022 21:09:46 +0800
Subject: [PATCH] update 初步适配oracle(未完成)
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 206 +++++++++++++++-----------------------------------
1 files changed, 63 insertions(+), 143 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 8f6a40f..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,13 +1,13 @@
package com.ruoyi.generator.service;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
@@ -28,10 +28,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;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
@@ -49,10 +46,23 @@
@Slf4j
@RequiredArgsConstructor
@Service
-public class GenTableServiceImpl implements IGenTableService {
+public class GenTableServiceImpl extends BaseGenTableServiceImpl {
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 +79,7 @@
@Override
public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
- Page<GenTable> page = baseMapper.selectPageGenTableList(pageQuery.build(), genTable);
- return TableDataInfo.build(page);
- }
-
- @Override
- public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
- Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable);
+ Page<GenTable> page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
return TableDataInfo.build(page);
}
@@ -87,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);
}
/**
@@ -98,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;
}
/**
@@ -129,7 +165,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void updateGenTable(GenTable genTable) {
String options = JsonUtils.toJsonString(genTable.getParams());
genTable.setOptions(options);
@@ -148,7 +183,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteGenTableByIds(Long[] tableIds) {
List<Long> ids = Arrays.asList(tableIds);
baseMapper.deleteBatchIds(ids);
@@ -161,7 +195,6 @@
* @param tableList 瀵煎叆琛ㄥ垪琛�
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void importGenTable(List<GenTable> tableList) {
String operName = LoginHelper.getUsername();
try {
@@ -219,21 +252,6 @@
}
/**
- * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
- *
- * @param tableName 琛ㄥ悕绉�
- * @return 鏁版嵁
- */
- @Override
- public byte[] downloadCode(String tableName) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- ZipOutputStream zip = new ZipOutputStream(outputStream);
- generatorCode(tableName, zip);
- IoUtil.close(zip);
- return outputStream.toByteArray();
- }
-
- /**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*
* @param tableName 琛ㄥ悕绉�
@@ -275,7 +293,6 @@
* @param tableName 琛ㄥ悕绉�
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void synchDb(String tableName) {
GenTable table = baseMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns();
@@ -294,8 +311,16 @@
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 {
@@ -314,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);
- }
- IoUtil.close(zip);
- return outputStream.toByteArray();
- }
-
- /**
* 鏌ヨ琛ㄤ俊鎭苟鐢熸垚浠ｇ爜
*/
- private void generatorCode(String tableName, ZipOutputStream zip) {
+ @Override
+ public void generatorCode(String tableName, ZipOutputStream zip) {
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableByName(tableName);
// 璁剧疆涓诲瓙琛ㄤ俊鎭�
@@ -366,59 +375,6 @@
}
/**
- * 淇敼淇濆瓨鍙傛暟鏍￠獙
- *
- * @param genTable 涓氬姟淇℃伅
- */
- @Override
- public void validateEdit(GenTable genTable) {
- if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
- Map<String, Object> paramsObj = genTable.getParams();
- if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_CODE))) {
- throw new ServiceException("鏍戠紪鐮佸瓧娈典笉鑳戒负绌�");
- } else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
- throw new ServiceException("鏍戠埗缂栫爜瀛楁涓嶈兘涓虹┖");
- } else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_NAME))) {
- throw new ServiceException("鏍戝悕绉板瓧娈典笉鑳戒负绌�");
- } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
- if (StringUtils.isEmpty(genTable.getSubTableName())) {
- throw new ServiceException("鍏宠仈瀛愯〃鐨勮〃鍚嶄笉鑳戒负绌�");
- } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
- throw new ServiceException("瀛愯〃鍏宠仈鐨勫閿悕涓嶈兘涓虹┖");
- }
- }
- }
- }
-
- /**
- * 璁剧疆涓婚敭鍒椾俊鎭�
- *
- * @param table 涓氬姟琛ㄤ俊鎭�
- */
- public void setPkColumn(GenTable table) {
- for (GenTableColumn column : table.getColumns()) {
- if (column.isPk()) {
- table.setPkColumn(column);
- break;
- }
- }
- if (ObjectUtil.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 (ObjectUtil.isNull(table.getSubTable().getPkColumn())) {
- table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
- }
- }
- }
-
- /**
* 璁剧疆涓诲瓙琛ㄤ俊鎭�
*
* @param table 涓氬姟琛ㄤ俊鎭�
@@ -430,40 +386,4 @@
}
}
- /**
- * 璁剧疆浠ｇ爜鐢熸垚鍏朵粬閫夐」鍊�
- *
- * @param genTable 璁剧疆鍚庣殑鐢熸垚瀵硅薄
- */
- public void setTableFromOptions(GenTable genTable) {
- Map<String, Object> paramsObj = JsonUtils.parseMap(genTable.getOptions());
- if (ObjectUtil.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 (StringUtils.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