生成代码优化

eco-common/common-mapper/src/main/java/com/phm/common/mapper/annotation/FieldMapper.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/annotation/FieldMapper.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.annotation;
+package com.eco.common.mapper.annotation;
 
+import com.eco.common.mapper.core.handler.FieldMapperHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.phm.common.mapper.core.handler.FieldMapperHandler;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

eco-common/common-mapper/src/main/java/com/phm/common/mapper/annotation/FieldMapperType.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/annotation/FieldMapperType.java

@@ -1,4 +1,6 @@
-package com.phm.common.mapper.annotation;
+package com.eco.common.mapper.annotation;
+
+import com.eco.common.mapper.core.FieldMapperInterface;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -8,7 +10,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * @Description: FieldMapperType 映射类型注释 (标注到{@link com.phm.common.mapper.core.FieldMapperInterface} 的实现类)
+ * @Description: FieldMapperType 映射类型注释 (标注到{@link FieldMapperInterface} 的实现类)
  * @Author: GaoKun Wang
  * @Date: 2024/7/1
  */

eco-common/common-mapper/src/main/java/com/phm/common/mapper/config/FieldMapperConfig.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/config/FieldMapperConfig.java

@@ -1,10 +1,10 @@
-package com.phm.common.mapper.config;
+package com.eco.common.mapper.config;
 
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.core.handler.FieldMapperBeanSerializerModifier;
+import com.eco.common.mapper.core.handler.FieldMapperHandler;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.core.FieldMapperInterface;
-import com.phm.common.mapper.core.handler.FieldMapperBeanSerializerModifier;
-import com.phm.common.mapper.core.handler.FieldMapperHandler;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

eco-common/common-mapper/src/main/java/com/phm/common/mapper/constant/MapperConstant.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/constant/MapperConstant.java

@@ -1,4 +1,4 @@
-package com.phm.common.mapper.constant;
+package com.eco.common.mapper.constant;
 
 /**
  * @Description: MapperConstant 常量

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/FieldMapperInterface.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/FieldMapperInterface.java

@@ -1,8 +1,10 @@
-package com.phm.common.mapper.core;
+package com.eco.common.mapper.core;
+
+import com.eco.common.mapper.annotation.FieldMapperType;
 
 /**
  * @Description: FieldMapperInterface接口
- * (实现类需标注 {@link com.phm.common.mapper.annotation.FieldMapperType} 注解标明翻译类型)
+ * (实现类需标注 {@link FieldMapperType} 注解标明翻译类型)
  * @Author: GaoKun Wang
  * @Date: 2024/7/1
  */

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/handler/FieldMapperBeanSerializerModifier.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/handler/FieldMapperBeanSerializerModifier.java

@@ -1,4 +1,4 @@
-package com.phm.common.mapper.core.handler;
+package com.eco.common.mapper.core.handler;
 
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.SerializationConfig;

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/handler/FieldMapperHandler.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/handler/FieldMapperHandler.java

@@ -1,14 +1,14 @@
-package com.phm.common.mapper.core.handler;
+package com.eco.common.mapper.core.handler;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.eco.common.mapper.core.FieldMapperInterface;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.phm.common.mapper.annotation.FieldMapper;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapper;
 import org.eco.common.core.utils.StringUtils;
 import org.eco.common.core.utils.reflect.ReflectUtils;
 

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/DeptNameMapperImpl.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/DeptNameMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.DeptService;
 

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/DictTypeMapperImpl.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/DictTypeMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.DictService;
 import org.eco.common.core.utils.StringUtils;

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/NicknameMapperImpl.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/NicknameMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.UserService;
 

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/OssUrlMapperImpl.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/OssUrlMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.core.FieldMapperInterface;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.OssService;
 

eco-common/common-mapper/src/main/java/com/phm/common/mapper/core/impl/UserNameMapperImpl.java → eco-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/UserNameMapperImpl.java

@@ -1,8 +1,8 @@
-package com.phm.common.mapper.core.impl;
+package com.eco.common.mapper.core.impl;
 
-import com.phm.common.mapper.annotation.FieldMapperType;
-import com.phm.common.mapper.constant.MapperConstant;
-import com.phm.common.mapper.core.FieldMapperInterface;
+import com.eco.common.mapper.annotation.FieldMapperType;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.core.FieldMapperInterface;
 import lombok.AllArgsConstructor;
 import org.eco.common.core.service.UserService;
 

eco-common/common-mapper/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,6 +1,6 @@
-com.phm.common.mapper.config.FieldMapperConfig
-com.phm.common.mapper.core.impl.DeptNameMapperImpl
-com.phm.common.mapper.core.impl.DictTypeMapperImpl
-com.phm.common.mapper.core.impl.NicknameMapperImpl
-com.phm.common.mapper.core.impl.OssUrlMapperImpl
-com.phm.common.mapper.core.impl.UserNameMapperImpl
+com.eco.common.mapper.config.FieldMapperConfig
+com.eco.common.mapper.core.impl.DeptNameMapperImpl
+com.eco.common.mapper.core.impl.DictTypeMapperImpl
+com.eco.common.mapper.core.impl.NicknameMapperImpl
+com.eco.common.mapper.core.impl.OssUrlMapperImpl
+com.eco.common.mapper.core.impl.UserNameMapperImpl

eco-modules/generator/src/main/resources/vm/api/api.ts.types.vm

@@ -1,4 +1,8 @@
+#if($table.crud || $table.sub)
 import { PageQuery, BaseEntity } from '@/api/interface/index'
+#elseif($table.tree)
+import { BaseEntity } from '@/api/interface/index'
+#end
 export interface ${BusinessName}VO extends BaseEntity {
 #foreach ($column in $columns)
     #if($column.list)

eco-modules/generator/src/main/resources/vm/api/api.ts.vm

@@ -66,5 +66,5 @@ export const import${BusinessName}DataApi = (data: any) => {
  * @returns returns
  */
 export const export${BusinessName}Api = (data: any) => {
-    return http.downloadPost('/${moduleName}/${businessName}/export', data)
+    return http.post('/${moduleName}/${businessName}/export', data)
 }

eco-modules/generator/src/main/resources/vm/java/controller.java.vm

@@ -1,7 +1,5 @@
 package ${packageName}.controller;
 
-import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -13,16 +11,21 @@ import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.web.annotation.RepeatSubmit;
+import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.web.core.BaseController;
 import jakarta.annotation.Resource;
+import ${packageName}.domain.vo.${ClassName}ImportVo;
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.service.I${ClassName}Service;
 import org.springframework.web.multipart.MultipartFile;
-#if($table.crud || $table.sub)
-import org.eco.common.core.core.page.PageResult;
-#elseif($table.tree)
-#end
+    #if($table.crud || $table.sub)
+    import org.eco.common.core.core.page.PageResult;
+    #elseif($table.tree)
+    #end
+
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  * ${functionName}Controller
@@ -67,6 +70,12 @@ public class ${ClassName}Controller extends BaseController {
         return CommonResult.success();
     }
 
+    @SaCheckPermission("${permissionPrefix}:import")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "${functionName}", ${ClassName}ImportVo.class, response);
+    }
+
     /**
      * 导入${functionName}列表
      */

eco-modules/generator/src/main/resources/vm/java/vo.java.vm

@@ -8,6 +8,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
+import com.eco.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,53 +31,64 @@ import org.eco.common.orm.core.domain.TreeEntity;
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud || $table.sub)
-    #set($Entity="BaseEntity")
-#elseif($table.tree)
-    #set($Entity="TreeEntity")
-#end
-@Data
-@ExcelIgnoreUnannotated
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = ${ClassName}.class)
-public class ${ClassName}Vo extends ${Entity} implements Serializable {
+    #if($table.crud || $table.sub)
+        #set($Entity="BaseEntity")
+    #elseif($table.tree)
+        #set($Entity="TreeEntity")
+    #end
+    @Data
+    @ExcelIgnoreUnannotated
+    @EqualsAndHashCode(callSuper = true)
+    @AutoMapper(target = ${ClassName}.class)
+    public class ${ClassName}Vo extends ${Entity} implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-#foreach ($column in $columns)
-    #if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-    #if($column.list)
-    #set($parentheseIndex=$column.columnComment.indexOf("（"))
-    #if($parentheseIndex != -1)
-        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-    #else
-        #set($comment=$column.columnComment)
-    #end
-    #if(${column.dictType} && ${column.dictType} != '')
-    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "${column.dictType}")
-    #elseif($parentheseIndex != -1)
-    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
-    #else
-    @ExcelProperty(value = "${comment}")
-    #end
-    private $column.javaType $column.javaField;
+    #foreach ($column in $columns)
+        #if(!$table.isSuperColumn($column.javaField))
+            /** $column.columnComment */
+            #if($column.list)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if(${column.dictType} && ${column.dictType} != '')
+                @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+                @ExcelDictFormat(dictType = "${column.dictType}")
+                #elseif($parentheseIndex != -1)
+                @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+                @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
+                #else
+                @ExcelProperty(value = "${comment}")
+                #end
+            private $column.javaType $column.javaField;
 
-    #else
-    @ExcelProperty(value = "${column.columnComment}")
-    private $column.javaType $column.javaField;
+            #else
+                @ExcelProperty(value = "${column.columnComment}")
+                private $column.javaType $column.javaField;
 
+            #end
+        #end
     #end
+
+    #if($table.sub)
+        /** $table.subTable.functionName信息 */
+        @RelationOneToMany(selfField = "${pkColumn.javaField}", targetField = "${pkColumn.javaField}")
+        private List<${subClassName}> ${subclassName}List;
     #end
-#end
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
 
-#if($table.sub)
-    /** $table.subTable.functionName信息 */
-    @RelationOneToMany(selfField = "${pkColumn.javaField}", targetField = "${pkColumn.javaField}")
-    private List<${subClassName}> ${subclassName}List;
-#end
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateByName;
 
 }

eco-modules/generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -6,6 +6,12 @@
                 <el-button type="primary" v-auth="['${moduleName}:${businessName}:add']" icon="CirclePlus" @click="openDialog(1, '${functionName}新增')">
                     新增
                 </el-button>
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:import']" icon="Upload" plain @click="batchAdd">
+                    导入
+                </el-button>
+                <el-button type="primary" v-auth="['${moduleName}:${businessName}:export']" icon="Download" plain @click="downloadFile">
+                    导出
+                </el-button>
             </template>
             <!-- 表格操作 -->
             <template #operation="scope">
@@ -38,12 +44,15 @@
         </ProTable>
         <FormDialog ref="formDialogRef" :items-options="itemsOptions" :model="model"/>
         <ImportExcel ref="dialogRef" />
+        <TaskDialog ref="taskDialogRef" />
     </div>
 </template>
 
 <script setup lang="tsx" name="${BusinessName}">
     import { useHandleData } from '@/hooks/useHandleData'
+    import { ElMessageBox } from 'element-plus'
     import ImportExcel from '@/components/ImportExcel/index.vue'
+    import TaskDialog from '@/components/TaskDialog/index.vue'
     import FormDialog from '@/components/FormDialog/index.vue'
     import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
     import { handleTree } from '@/utils/common'
@@ -52,6 +61,9 @@
         del${BusinessName}Api,
         add${BusinessName}Api,
         update${BusinessName}Api,
+        importTemplateApi,
+        import${BusinessName}DataApi,
+        export${BusinessName}Api,
         get${BusinessName}Api
     } from '@/api/modules/${moduleName}/${businessName}'
         #if(${dicts} != '')
@@ -82,6 +94,27 @@
         proTable.value?.getTableList()
     }
 
+    const taskDialogRef = ref<InstanceType<typeof TaskDialog> | null>(null)
+    // 导出${functionName}列表
+    const downloadFile = async () => {
+        ElMessageBox.confirm('确认导出${functionName}数据?', '温馨提示', { type: 'warning' }).then(async () => {
+            export${BusinessName}Api(proTable.value?.searchParam)
+            taskDialogRef.value?.openExportDialog()
+        })
+    }
+
+    // 批量添加${functionName}
+    const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
+    const batchAdd = () => {
+        const params = {
+            title: '${functionName}',
+            tempApi: importTemplateApi,
+            importApi: import${BusinessName}DataApi,
+            getTableList: proTable.value?.getTableList
+        }
+        dialogRef.value?.acceptParams(params)
+    }
+
     const formDialogRef = ref<InstanceType<typeof FormDialog> | null>(null)
     // 打开弹框的功能
     const openDialog = async (type: number, title: string, row?: any) => {

eco-modules/generator/src/main/resources/vm/vue/index.vue.vm

@@ -50,14 +50,15 @@
   </ProTable>
   <FormDialog ref="formDialogRef" :items-options="itemsOptions" :model="model"/>
   <ImportExcel ref="dialogRef" />
+  <TaskDialog ref="taskDialogRef" />
 </div>
 </template>
 
 <script setup lang="tsx" name="${BusinessName}">
 import { useHandleData } from '@/hooks/useHandleData'
-import { useDownload } from '@/hooks/useDownload'
 import { ElMessageBox } from 'element-plus'
 import ImportExcel from '@/components/ImportExcel/index.vue'
+import TaskDialog from '@/components/TaskDialog/index.vue'
 import FormDialog from '@/components/FormDialog/index.vue'
 import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
 import {
@@ -93,11 +94,13 @@ const batchDelete = async (ids: string[]) => {
   proTable.value?.getTableList()
 }
 
+const taskDialogRef = ref<InstanceType<typeof TaskDialog> | null>(null)
 // 导出${functionName}列表
 const downloadFile = async () => {
-  ElMessageBox.confirm('确认导出${functionName}数据?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(export${BusinessName}Api, '${functionName}列表', proTable.value?.searchParam)
-  )
+  ElMessageBox.confirm('确认导出${functionName}数据?', '温馨提示', { type: 'warning' }).then(async () => {
+    export${BusinessName}Api(proTable.value?.searchParam)
+    taskDialogRef.value?.openExportDialog()
+  })
 }
 
 // 批量添加${functionName}

eco-modules/system/src/main/java/org/eco/system/domain/vo/ImportExportVo.java

@@ -1,8 +1,8 @@
 package org.eco.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.phm.common.mapper.annotation.FieldMapper;
-import com.phm.common.mapper.constant.MapperConstant;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.eco.system.domain.ImportExport;