tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: 代码生成临时提交

Browse Source
This commit is contained in:
ray
2024-07-24 08:13:47 +08:00
parent cc8a24645b
commit 8a6adef303
13 changed files with 158 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/youlai/system/service/GeneratorService.java
View File

@@ -1,7 +1,7 @@
package com.youlai.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.system.model.form.GenCodeConfigForm;
import com.youlai.system.model.form.GenConfigForm;
import com.youlai.system.model.query.TablePageQuery;
import com.youlai.system.model.vo.TableColumnVO;
import com.youlai.system.model.vo.GeneratorPreviewVO;
@@ -48,7 +48,7 @@ public interface GeneratorService {
* @param tableName 表名
* @return
*/
GenCodeConfigForm getGenCodeConfig(String tableName);
GenConfigForm getGenConfig(String tableName);
/**
* 保存代码生成配置
@@ -56,5 +56,5 @@ public interface GeneratorService {
* @param formData 表单数据
* @return
*/
boolean saveGenCodeConfig(GenCodeConfigForm formData);
boolean saveGenCodeConfig(GenConfigForm formData);
}

37
src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.youlai.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
@@ -17,7 +16,7 @@ import com.youlai.system.mapper.GenConfigMapper;
import com.youlai.system.mapper.GenFieldConfigMapper;
import com.youlai.system.model.entity.GenConfig;
import com.youlai.system.model.entity.GenFieldConfig;
import com.youlai.system.model.form.GenCodeConfigForm;
import com.youlai.system.model.form.GenConfigForm;
import com.youlai.system.model.query.TablePageQuery;
import com.youlai.system.model.vo.TableColumnVO;
import com.youlai.system.model.vo.GeneratorPreviewVO;
@@ -75,17 +74,35 @@ public class GeneratorServiceImpl implements GeneratorService {
return databaseMapper.getTableColumns(tableName);
}
/**
* 获取代码生成配置
*
* @param tableName 表名 eg: sys_user
* @return 代码生成配置
*/
@Override
public GenCodeConfigForm getGenCodeConfig(String tableName) {
public GenConfigForm getGenConfig(String tableName) {
// 查询表生成配置
GenConfig genConfig = genConfigMapper.selectOne(
new LambdaQueryWrapper<>(GenConfig.class)
.eq(GenConfig::getTableName, tableName)
.last("LIMIT 1")
);
// 查询字段生成配置
List<GenFieldConfig> fieldConfigs = genFieldConfigMapper.selectList(
new LambdaQueryWrapper<>(GenFieldConfig.class)
.eq(GenFieldConfig::getConfigId, genConfig.getId())
);
GenConfigForm genConfigForm = new GenConfigForm();
genConfigMapper.selectOne(new LambdaQueryWrapper<>(GenConfig.class).eq(GenConfig::getTableName, tableName));
return null;
}
@Override
public boolean saveGenCodeConfig(GenCodeConfigForm formData) {
public boolean saveGenCodeConfig(GenConfigForm formData) {
return false;
}
@@ -107,7 +124,7 @@ public class GeneratorServiceImpl implements GeneratorService {
Assert.isTrue(genConfig != null, "未找到表生成配置");
List<GenFieldConfig> fieldConfigs = genFieldConfigMapper.selectList(new LambdaQueryWrapper<GenFieldConfig>()
.eq(GenFieldConfig::getConfigId, genConfig.getId())
.eq(GenFieldConfig::getGenConfigId, genConfig.getId())
);
Assert.isTrue(CollectionUtil.isNotEmpty(fieldConfigs), "未找到字段生成配置");
@@ -153,8 +170,6 @@ public class GeneratorServiceImpl implements GeneratorService {
}
private String getFileName(String entityName, String templateName, String extension) {
if (templateName.equals("Entity")) {
return entityName + extension;
@@ -162,8 +177,8 @@ public class GeneratorServiceImpl implements GeneratorService {
if (templateName.equals("MapperXml")) {
return entityName + "Mapper" + extension;
}
if (templateName.equals("API")|| templateName.equals("VIEW")) {
return StrUtil.toSymbolCase(entityName,'-') + extension;
if (templateName.equals("API") || templateName.equals("VIEW")) {
return StrUtil.toSymbolCase(entityName, '-') + extension;
}
return entityName + templateName + extension;
}

2
src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
return deptList.stream()
.filter(dept -> dept.getParentId().equals(parentId))
.map(dept -> {
DeptVO deptVO = deptConverter.convertToVo(dept);
DeptVO deptVO = deptConverter.toVo(dept);
List<DeptVO> children = recurDeptList(dept.getId(), deptList);
deptVO.setChildren(children);
return deptVO;