From 7f1356a447d290c186fe047af557e050497e39e4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 14 三月 2022 14:05:37 +0800
Subject: [PATCH] update 重构代码生成 多数据库sql加载 使用xml特性动态切换sql
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 25 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..ac0c6be 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,10 +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.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
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;
@@ -28,7 +31,6 @@
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;
@@ -46,6 +48,7 @@
*
* @author Lion Li
*/
+@DS("#header.datasource")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -53,6 +56,19 @@
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 +85,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 +97,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(), genTable);
+ return TableDataInfo.build(page);
}
/**
@@ -129,7 +156,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void updateGenTable(GenTable genTable) {
String options = JsonUtils.toJsonString(genTable.getParams());
genTable.setOptions(options);
@@ -148,7 +174,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteGenTableByIds(Long[] tableIds) {
List<Long> ids = Arrays.asList(tableIds);
baseMapper.deleteBatchIds(ids);
@@ -161,7 +186,6 @@
* @param tableList 瀵煎叆琛ㄥ垪琛�
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void importGenTable(List<GenTable> tableList) {
String operName = LoginHelper.getUsername();
try {
@@ -275,7 +299,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 +317,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 {
@@ -373,12 +404,13 @@
@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))) {
+ String options = JsonUtils.toJsonString(genTable.getParams());
+ Dict paramsObj = JsonUtils.parseMap(options);
+ if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) {
throw new ServiceException("鏍戠紪鐮佸瓧娈典笉鑳戒负绌�");
- } else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
+ } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) {
throw new ServiceException("鏍戠埗缂栫爜瀛楁涓嶈兘涓虹┖");
- } else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_NAME))) {
+ } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
throw new ServiceException("鏍戝悕绉板瓧娈典笉鑳戒负绌�");
} else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
if (StringUtils.isEmpty(genTable.getSubTableName())) {
@@ -436,13 +468,13 @@
* @param genTable 璁剧疆鍚庣殑鐢熸垚瀵硅薄
*/
public void setTableFromOptions(GenTable genTable) {
- Map<String, Object> paramsObj = JsonUtils.parseMap(genTable.getOptions());
+ Dict 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));
+ 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);
+ String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME);
genTable.setTreeCode(treeCode);
genTable.setTreeParentCode(treeParentCode);
@@ -467,3 +499,4 @@
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
}
+
--
Gitblit v1.9.3