From 2fc3dcfc74c40a756fb5a9b7cf73338e085966cf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 05 七月 2021 16:35:15 +0800
Subject: [PATCH] update 更改演示案例
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 961bf31..5fcdd3b 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,14 @@
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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.JsonUtils;
@@ -49,7 +50,7 @@
*/
@Slf4j
@Service
-public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> implements IGenTableService {
+public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTable> implements IGenTableService {
@Autowired
private GenTableColumnMapper genTableColumnMapper;
@@ -181,9 +182,9 @@
List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
for (GenTableColumn column : genTableColumns) {
GenUtils.initColumnField(column, table);
- genTableColumnMapper.insert(column);
}
- }
+ genTableColumnMapper.insertAll(genTableColumns);
+ }
}
} catch (Exception e) {
throw new CustomException("瀵煎叆澶辫触锛�" + e.getMessage());
@@ -257,7 +258,7 @@
// 鑾峰彇妯℃澘鍒楄〃
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates) {
- if (!StrUtil.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
+ if (!StrUtil.containsAny("sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm", template)) {
// 娓叉煋妯℃澘
StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8);
@@ -289,9 +290,9 @@
dbTableColumns.forEach(column -> {
if (!tableColumnNames.contains(column.getColumnName())) {
GenUtils.initColumnField(column, table);
- genTableColumnMapper.insert(column);
- }
- });
+ }
+ });
+ genTableColumnMapper.insertAll(tableColumns);
List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(delColumns)) {
@@ -423,13 +424,13 @@
* @param genTable 璁剧疆鍚庣殑鐢熸垚瀵硅薄
*/
public void setTableFromOptions(GenTable genTable) {
- Map<String, String> paramsObj = JsonUtils.parseMap(genTable.getOptions());
+ Map<String, Object> paramsObj = JsonUtils.parseMap(genTable.getOptions());
if (Validator.isNotNull(paramsObj)) {
- String treeCode = paramsObj.get(GenConstants.TREE_CODE);
- String treeParentCode = paramsObj.get(GenConstants.TREE_PARENT_CODE);
- String treeName = paramsObj.get(GenConstants.TREE_NAME);
- String parentMenuId = paramsObj.get(GenConstants.PARENT_MENU_ID);
- String parentMenuName = paramsObj.get(GenConstants.PARENT_MENU_NAME);
+ 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);
@@ -442,7 +443,7 @@
/**
* 鑾峰彇浠ｇ爜鐢熸垚鍦板潃
*
- * @param table 涓氬姟琛ㄤ俊鎭�
+ * @param table 涓氬姟琛ㄤ俊鎭�
* @param template 妯℃澘鏂囦欢璺緞
* @return 鐢熸垚鍦板潃
*/
--
Gitblit v1.9.3