From 4c57c2a04408fb8f9c0c08cf8d1919c76a90658c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 四月 2022 11:50:16 +0800
Subject: [PATCH] update springboot-admin 2.6.5 => 2.6.6 update qiniu 7.9.3 => 7.9.5 update qcloud 5.6.68 => 5.6.72 update minio 8.3.7 => 8.3.8 update okhttp 4.9.2 => 4.9.3
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 80 ++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 47 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 80b1c96..9dccab2 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,10 @@
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.mybatisplus.core.conditions.Wrapper;
+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;
@@ -31,7 +33,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;
@@ -49,6 +50,7 @@
*
* @author Lion Li
*/
+@DS("#header.datasource")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -56,6 +58,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));
+ }
/**
* 鏌ヨ涓氬姟淇℃伅
@@ -76,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();
@@ -100,34 +104,8 @@
@Override
public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
- Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), this.buildDbTableQueryWrapper(genTable));
+ 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(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;
}
/**
@@ -158,7 +136,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void updateGenTable(GenTable genTable) {
String options = JsonUtils.toJsonString(genTable.getParams());
genTable.setOptions(options);
@@ -177,7 +154,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteGenTableByIds(Long[] tableIds) {
List<Long> ids = Arrays.asList(tableIds);
baseMapper.deleteBatchIds(ids);
@@ -190,7 +166,6 @@
* @param tableList 瀵煎叆琛ㄥ垪琛�
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void importGenTable(List<GenTable> tableList) {
String operName = LoginHelper.getUsername();
try {
@@ -227,6 +202,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);
// 璁剧疆涓婚敭鍒椾俊鎭�
@@ -304,7 +285,6 @@
* @param tableName 琛ㄥ悕绉�
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void synchDb(String tableName) {
GenTable table = baseMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns();
@@ -328,9 +308,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());
@@ -374,6 +353,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);
// 璁剧疆涓婚敭鍒椾俊鎭�
@@ -506,3 +491,4 @@
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
}
+
--
Gitblit v1.9.3