diff --git a/src/main/java/com/youlai/boot/config/WebMvcConfig.java b/src/main/java/com/youlai/boot/config/WebMvcConfig.java index 20f73586..a865c163 100644 --- a/src/main/java/com/youlai/boot/config/WebMvcConfig.java +++ b/src/main/java/com/youlai/boot/config/WebMvcConfig.java @@ -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); diff --git a/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java index 299b80aa..255d83f5 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java @@ -60,7 +60,12 @@ public enum FormTypeEnum implements IBaseEnum { /** * 日期框 */ - DATE_TIME(9, "日期时间框"); + DATE_TIME(9, "日期时间框"), + + /** + * 隐藏域 + */ + HIDDEN(10, "隐藏域"); // Mybatis-Plus 提供注解表示插入数据库时插入该值 diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java index 3c3bb731..906c2982 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java @@ -78,13 +78,13 @@ public class GenConfigServiceImpl extends ServiceImpl 用户 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()); // 默认模块名 diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 56034645..8bd7dc3e 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -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 diff --git a/src/main/resources/templates/codegen/api.ts.vm b/src/main/resources/templates/codegen/api.ts.vm index 1e2e6c97..cbf8f6dd 100644 --- a/src/main/resources/templates/codegen/api.ts.vm +++ b/src/main/resources/templates/codegen/api.ts.vm @@ -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({ @@ -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({ diff --git a/src/main/resources/templates/codegen/index.vue.vm b/src/main/resources/templates/codegen/index.vue.vm index faedf21c..c7bdad55 100644 --- a/src/main/resources/templates/codegen/index.vue.vm +++ b/src/main/resources/templates/codegen/index.vue.vm @@ -13,7 +13,7 @@ @keyup.enter="handleQuery()" /> #elseif($fieldConfig.formType == "SELECT") - #if($fieldConfig.dictType != "") + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") #else @@ -22,15 +22,23 @@ #end #elseif($fieldConfig.formType == "RADIO") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "CHECK_BOX") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "INPUT_NUMBER") #foreach($fieldConfig in $fieldConfigs) #if($fieldConfig.isShowInList == 1) - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + + + #else + + #end #end #end @@ -178,7 +194,7 @@ > #foreach($fieldConfig in $fieldConfigs) - #if($fieldConfig.isShowInForm == 1) + #if($fieldConfig.isShowInForm == 1 && $fieldConfig.formType != "HIDDEN") #if($fieldConfig.formType == "INPUT") #elseif($fieldConfig.formType == "SELECT") - #if($fieldConfig.dictType != "") + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") #else @@ -195,15 +211,23 @@ #end #elseif($fieldConfig.formType == "RADIO") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "CHECK_BOX") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "INPUT_NUMBER") #end + + #elseif($fieldConfig.formType == "HIDDEN") + #end #end