From c6b0e61f4447099060ccd881e72d5d35edac2c97 Mon Sep 17 00:00:00 2001
From: 友杰 <273666957@qq.com>
Date: 星期四, 30 六月 2022 13:41:03 +0800
Subject: [PATCH] update ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java. bug-修复代码生成首字母大写问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 80 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 30 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 154f026..2a99a2e 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
@@ -3,8 +3,13 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Dict;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
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;
@@ -46,6 +51,7 @@
*
* @author Lion Li
*/
+@DS("#header.datasource")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -53,6 +59,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,36 +88,25 @@
@Override
public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
- Page<GenTable> page = baseMapper.selectPageGenTableList(pageQuery.build(), genTable);
+ Page<GenTable> page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
return TableDataInfo.build(page);
}
+
+ 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);
- }
-
- /**
- * 鏌ヨ涓氬姟鍒楄〃
- *
- * @param genTable 涓氬姟淇℃伅
- * @return 涓氬姟闆嗗悎
- */
- @Override
- public List<GenTable> selectGenTableList(GenTable genTable) {
- return baseMapper.selectGenTableList(genTable);
- }
-
- /**
- * 鏌ヨ鎹簱鍒楄〃
- *
- * @param genTable 涓氬姟淇℃伅
- * @return 鏁版嵁搴撹〃闆嗗悎
- */
- @Override
- public List<GenTable> selectDbTableList(GenTable genTable) {
- return baseMapper.selectDbTableList(genTable);
}
/**
@@ -128,8 +136,8 @@
* @param genTable 涓氬姟淇℃伅
* @return 缁撴灉
*/
- @Override
@Transactional(rollbackFor = Exception.class)
+ @Override
public void updateGenTable(GenTable genTable) {
String options = JsonUtils.toJsonString(genTable.getParams());
genTable.setOptions(options);
@@ -147,8 +155,8 @@
* @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
- @Override
@Transactional(rollbackFor = Exception.class)
+ @Override
public void deleteGenTableByIds(Long[] tableIds) {
List<Long> ids = Arrays.asList(tableIds);
baseMapper.deleteBatchIds(ids);
@@ -160,8 +168,8 @@
*
* @param tableList 瀵煎叆琛ㄥ垪琛�
*/
- @Override
@Transactional(rollbackFor = Exception.class)
+ @Override
public void importGenTable(List<GenTable> tableList) {
String operName = LoginHelper.getUsername();
try {
@@ -198,6 +206,12 @@
Map<String, String> dataMap = new LinkedHashMap<>();
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableById(tableId);
+ Snowflake snowflake = IdUtil.getSnowflake();
+ List<Long> menuIds = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+ menuIds.add(snowflake.nextId());
+ }
+ table.setMenuIds(menuIds);
// 璁剧疆涓诲瓙琛ㄤ俊鎭�
setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
@@ -274,8 +288,8 @@
*
* @param tableName 琛ㄥ悕绉�
*/
- @Override
@Transactional(rollbackFor = Exception.class)
+ @Override
public void synchDb(String tableName) {
GenTable table = baseMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns();
@@ -299,9 +313,8 @@
column.setQueryType(prevColumn.getQueryType());
}
if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
- && (column.isInsert() || column.isEdit())
- && ((column.isUsableColumn()) || (!column.isSuperColumn())))
- {
+ && (column.isInsert() || column.isEdit())
+ && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
// 濡傛灉鏄�(鏂板/淇敼&闈炰富閿�/闈炲拷鐣ュ強鐖跺睘鎬�)锛岀户缁繚鐣欏繀濉�/鏄剧ず绫诲瀷閫夐」
column.setIsRequired(prevColumn.getIsRequired());
column.setHtmlType(prevColumn.getHtmlType());
@@ -345,6 +358,12 @@
private void generatorCode(String tableName, ZipOutputStream zip) {
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableByName(tableName);
+ Snowflake snowflake = IdUtil.getSnowflake();
+ List<Long> menuIds = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+ menuIds.add(snowflake.nextId());
+ }
+ table.setMenuIds(menuIds);
// 璁剧疆涓诲瓙琛ㄤ俊鎭�
setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
@@ -477,3 +496,4 @@
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
}
+
--
Gitblit v1.9.3