From b3541e975898e17a6cbc1a9ea776f3ec7e91d39a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 12 六月 2021 20:13:35 +0800
Subject: [PATCH] update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 1519f3c..1568824 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
@@ -6,10 +6,13 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
@@ -63,6 +66,16 @@
GenTable genTable = baseMapper.selectGenTableById(id);
setTableFromOptions(genTable);
return genTable;
+ }
+
+ @Override
+ public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageGenTableList(PageUtils.buildPage(), genTable));
+ }
+
+ @Override
+ public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageDbTableList(PageUtils.buildPage(), genTable));
}
/**
@@ -122,7 +135,16 @@
int row = baseMapper.updateById(genTable);
if (row > 0) {
for (GenTableColumn cenTableColumn : genTable.getColumns()) {
- genTableColumnMapper.updateById(cenTableColumn);
+ genTableColumnMapper.update(cenTableColumn,
+ new LambdaUpdateWrapper<GenTableColumn>()
+ .set(cenTableColumn.getIsPk() == null, GenTableColumn::getIsPk, null)
+ .set(cenTableColumn.getIsIncrement() == null, GenTableColumn::getIsIncrement, null)
+ .set(cenTableColumn.getIsInsert() == null, GenTableColumn::getIsInsert, null)
+ .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
+ .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
+ .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
+ .set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
+ .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
}
@@ -241,12 +263,8 @@
StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8);
tpl.merge(context, sw);
- try {
- String path = getGenPath(table, template);
- FileUtils.writeStringToFile(new File(path), sw.toString(), Constants.UTF8);
- } catch (IOException e) {
- throw new CustomException("娓叉煋妯℃澘澶辫触锛岃〃鍚嶏細" + table.getTableName());
- }
+ String path = getGenPath(table, template);
+ FileUtils.writeUtf8String(sw.toString(), path);
}
}
}
@@ -437,4 +455,4 @@
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3