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

Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

Browse Source
This commit is contained in:
Ray.Hao
2025-01-09 22:49:09 +08:00
parent c632478395 d56d7fa16b
commit aa444ac3e3
6 changed files with 69 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/boot/config/WebMvcConfig.java
View File

@@ -20,6 +20,7 @@ import org.springframework.validation.beanvalidation.SpringConstraintValidatorFa
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.util.List;
/**
@@ -50,6 +51,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance);
objectMapper.registerModule(simpleModule);
objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
jackson2HttpMessageConverter.setObjectMapper(objectMapper);
converters.add(1, jackson2HttpMessageConverter);

7
src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java
View File

@@ -60,7 +60,12 @@ public enum FormTypeEnum implements IBaseEnum<Integer> {
/**
* 日期框
*/
DATE_TIME(9, "日期时间框");
DATE_TIME(9, "日期时间框"),
/**
* 隐藏域
*/
HIDDEN(10, "隐藏域");
// Mybatis-Plus 提供注解表示插入数据库时插入该值

6
src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java
View File

@@ -78,13 +78,13 @@ public class GenConfigServiceImpl extends ServiceImpl<GenConfigMapper, GenConfig
genConfig = new GenConfig();
genConfig.setTableName(tableName);
// 表注释作为业务名称，去掉表字 例如：用户表 -> 用户
String tableComment = tableMetadata.getTableComment();
if (StrUtil.isNotBlank(tableComment)) {
genConfig.setBusinessName(tableComment.replace("表", "").trim());
}
// 实体类名 = 表名去掉前缀后转驼峰，前缀默认为下划线分割的第一个元素
String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0]));
genConfig.setEntityName(entityName);
// 根据表名生成实体类名 例如：sys_user -> SysUser
genConfig.setEntityName(StrUtil.toCamelCase(StrUtil.upperFirst(StrUtil.toCamelCase(tableName))));
genConfig.setPackageName(YouLaiBootApplication.class.getPackageName());
genConfig.setModuleName(codegenProperties.getDefaultConfig().getModuleName()); // 默认模块名

2
src/main/resources/mapper/system/UserMapper.xml
View File

@@ -156,7 +156,7 @@
LEFT JOIN sys_user_role t2 ON t2.user_id = t1.id
LEFT JOIN sys_role t3 ON t3.id = t2.role_id
WHERE
t1.username = #{username} AND t1.is_deleted = 0
t1.openid = #{openid} AND t1.is_deleted = 0
</select>
<!-- 获取用户导出列表 -->

8
src/main/resources/templates/codegen/api.ts.vm
View File

@@ -14,8 +14,8 @@ const ${entityName}API = {
/**
* 获取${businessName}表单数据
*
* @param id ${entityName}ID
* @returns ${entityName}表单数据
* @param id ${businessName}ID
* @returns ${businessName}表单数据
*/
getFormData(id: number) {
return request<any, ${entityName}Form>({
@@ -36,8 +36,8 @@ const ${entityName}API = {
/**
* 更新${businessName}
*
* @param id ${entityName}ID
* @param data ${entityName}表单数据
* @param id ${businessName}ID
* @param data ${businessName}表单数据
*/
update(id: number, data: ${entityName}Form) {
return request({

79
src/main/resources/templates/codegen/index.vue.vm
View File

@@ -13,7 +13,7 @@
@keyup.enter="handleQuery()"
/>
#elseif($fieldConfig.formType == "SELECT")
#if($fieldConfig.dictType != "")
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<dict v-model="queryParams.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
#else
<el-select v-model="queryParams.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
@@ -22,15 +22,23 @@
</el-select>
#end
#elseif($fieldConfig.formType == "RADIO")
<el-radio-group v-model="queryParams.$fieldConfig.fieldName">
<el-radio :key="1" :label="1">选项一</el-radio>
<el-radio :key="2" :label="2">选项二</el-radio>
</el-radio-group>
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<dict v-model="queryParams.$fieldConfig.fieldName" type="radio" code="$fieldConfig.dictType" />
#else
<el-radio-group v-model="queryParams.$fieldConfig.fieldName">
<el-radio :key="1" :label="1">选项一</el-radio>
<el-radio :key="2" :label="2">选项二</el-radio>
</el-radio-group>
#end
#elseif($fieldConfig.formType == "CHECK_BOX")
<el-checkbox-group v-model="queryParams.$fieldConfig.fieldName">
<el-checkbox :key="1" :label="1">选项一</el-checkbox>
<el-checkbox :key="2" :label="2">选项二</el-checkbox>
</el-checkbox-group>
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<dict v-model="queryParams.$fieldConfig.fieldName" type="checkbox" code="$fieldConfig.dictType" />
#else
<el-checkbox-group v-model="queryParams.$fieldConfig.fieldName">
<el-checkbox :key="1" :label="1">选项一</el-checkbox>
<el-checkbox :key="2" :label="2">选项二</el-checkbox>
</el-checkbox-group>
#end
#elseif($fieldConfig.formType == "INPUT_NUMBER")
<el-input-number
v-model="queryParams.$fieldConfig.fieldName"
@@ -125,13 +133,21 @@
<el-table-column type="selection" width="55" align="center" />
#foreach($fieldConfig in $fieldConfigs)
#if($fieldConfig.isShowInList == 1)
<el-table-column
key="$fieldConfig.fieldName"
label="$fieldConfig.fieldComment"
prop="$fieldConfig.fieldName"
min-width="150"
align="center"
/>
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<el-table-column label="$fieldConfig.fieldComment" width="150" align="center">
<template #default="scope">
<DictLabel v-model="scope.row.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
</template>
</el-table-column>
#else
<el-table-column
key="$fieldConfig.fieldName"
label="$fieldConfig.fieldComment"
prop="$fieldConfig.fieldName"
min-width="150"
align="center"
/>
#end
#end
#end
<el-table-column fixed="right" label="操作" width="220">
@@ -178,7 +194,7 @@
>
<el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
#foreach($fieldConfig in $fieldConfigs)
#if($fieldConfig.isShowInForm == 1)
#if($fieldConfig.isShowInForm == 1 && $fieldConfig.formType != "HIDDEN")
<el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
#if($fieldConfig.formType == "INPUT")
<el-input
@@ -186,7 +202,7 @@
placeholder="$fieldConfig.fieldComment"
/>
#elseif($fieldConfig.formType == "SELECT")
#if($fieldConfig.dictType != "")
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<dict v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
#else
<el-select v-model="formData.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
@@ -195,15 +211,23 @@
</el-select>
#end
#elseif($fieldConfig.formType == "RADIO")
<el-radio-group v-model="formData.$fieldConfig.fieldName">
<el-radio :value="0">选项一</el-radio>
<el-radio :value="1">选项二</el-radio>
</el-radio-group>
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<dict v-model="queryParams.$fieldConfig.fieldName" type="radio" code="$fieldConfig.dictType" />
#else
<el-radio-group v-model="formData.$fieldConfig.fieldName">
<el-radio :value="0">选项一</el-radio>
<el-radio :value="1">选项二</el-radio>
</el-radio-group>
#end
#elseif($fieldConfig.formType == "CHECK_BOX")
<el-checkbox-group v-model="formData.$fieldConfig.fieldName">
<el-checkbox :value="0">选项一</el-checkbox>
<el-checkbox :value="1">选项二</el-checkbox>
</el-checkbox-group>
#if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
<dict v-model="queryParams.$fieldConfig.fieldName" type="checkbox" code="$fieldConfig.dictType" />
#else
<el-checkbox-group v-model="formData.$fieldConfig.fieldName">
<el-checkbox :value="0">选项一</el-checkbox>
<el-checkbox :value="1">选项二</el-checkbox>
</el-checkbox-group>
#end
#elseif($fieldConfig.formType == "INPUT_NUMBER")
<el-input-number
v-model="formData.$fieldConfig.fieldName"
@@ -237,6 +261,9 @@
/>
#end
</el-form-item>
#elseif($fieldConfig.formType == "HIDDEN")
<el-input type="hidden" v-model="formData.$fieldConfig.fieldName" />
#end
#end
</el-form>