From 66138bfe7dcf203199107e6b91d9e2c7c519d945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Fri, 20 Jan 2023 15:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/template/java/Controller.java.ftl    |   5 +-
 .../src/main/resources/template/java/Dao.java.ftl  |   2 +-
 .../main/resources/template/java/Service.java.ftl  |   4 +-
 .../resources/template/java/ServiceImpl.java.ftl   |   4 +-
 .../resources/template/vue/add-or-update.vue.ftl   |   2 +-
 .../src/main/resources/template/vue/index.vue.ftl  | 231 ++++++++++-----------
 6 files changed, 113 insertions(+), 135 deletions(-)

diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl
index 2f3ed57..7c6f2c0 100644
--- a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl
+++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Controller.java.ftl
@@ -3,13 +3,14 @@ package ${package}.${moduleName}.controller;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import ${package}.framework.common.page.PageResult;
+import ${package}.framework.common.utils.PageResult;
 import ${package}.framework.common.utils.Result;
 import ${package}.${moduleName}.convert.${ClassName}Convert;
 import ${package}.${moduleName}.entity.${ClassName}Entity;
 import ${package}.${moduleName}.service.${ClassName}Service;
 import ${package}.${moduleName}.query.${ClassName}Query;
 import ${package}.${moduleName}.vo.${ClassName}VO;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,7 +33,7 @@ public class ${ClassName}Controller {
     @GetMapping("page")
     @Operation(summary = "分页")
     @PreAuthorize("hasAuthority('${moduleName}:${functionName}:page')")
-    public Result<PageResult<${ClassName}VO>> page(@Valid ${ClassName}Query query){
+    public Result<PageResult<${ClassName}VO>> page(@ParameterObject @Valid ${ClassName}Query query){
         PageResult<${ClassName}VO> page = ${className}Service.page(query);
 
         return Result.ok(page);
diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl
index 1e947de..ebf94e9 100644
--- a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl
+++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Dao.java.ftl
@@ -1,6 +1,6 @@
 package ${package}.${moduleName}.dao;
 
-import ${package}.framework.common.dao.BaseDao;
+import ${package}.framework.mybatis.dao.BaseDao;
 import ${package}.${moduleName}.entity.${ClassName}Entity;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl
index 2b20601..736759d 100644
--- a/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl
+++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/Service.java.ftl
@@ -1,7 +1,7 @@
 package ${package}.${moduleName}.service;
 
-import ${package}.framework.common.page.PageResult;
-import ${package}.framework.common.service.BaseService;
+import ${package}.framework.common.utils.PageResult;
+import ${package}.framework.mybatis.service.BaseService;
 import ${package}.${moduleName}.vo.${ClassName}VO;
 import ${package}.${moduleName}.query.${ClassName}Query;
 import ${package}.${moduleName}.entity.${ClassName}Entity;
diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl
index d7d5fa4..4f61914 100644
--- a/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl
+++ b/maku-boot-module/maku-module-generator/src/main/resources/template/java/ServiceImpl.java.ftl
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
-import ${package}.framework.common.page.PageResult;
-import ${package}.framework.common.service.impl.BaseServiceImpl;
+import ${package}.framework.common.utils.PageResult;
+import ${package}.framework.mybatis.service.impl.BaseServiceImpl;
 import ${package}.${moduleName}.convert.${ClassName}Convert;
 import ${package}.${moduleName}.entity.${ClassName}Entity;
 import ${package}.${moduleName}.query.${ClassName}Query;
diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl
index 0ab3074..22dff76 100644
--- a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl
+++ b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/add-or-update.vue.ftl
@@ -79,7 +79,7 @@ const visible = ref(false)
 const dataFormRef = ref()
 
 const dataForm = reactive({
-	<#list formList as field>
+	<#list fieldList as field>
 	${field.attrName}: ''<#sep>,
 	</#list>
 })
diff --git a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl
index 322399f..e8626e8 100644
--- a/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl
+++ b/maku-boot-module/maku-module-generator/src/main/resources/template/vue/index.vue.ftl
@@ -1,136 +1,113 @@
 <template>
-    <el-card>
-        <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
-            <#list queryList as field>
-                <el-form-item>
-                    <#if field.formType == 'text' || field.formType == 'textarea' || field.formType == 'editor'>
-                        <el-input v-model="state.queryForm.${field.attrName}"
-                                  placeholder="${field.fieldComment!}"></el-input>
-                    <#elseif field.queryFormType == 'select'>
-                        <#if field.queryDict??>
-                            <fast-select v-model="state.queryForm.${field.attrName}" dict-type="${field.queryDict}"
-                                         placeholder="${field.fieldComment!}" clearable></fast-select>
-                        <#else>
-                            <el-select v-model="state.queryForm.${field.attrName}" placeholder="${field.fieldComment!}">
-                                <el-option label="选择" value="0"></el-option>
-                            </el-select>
-                        </#if>
-                    <#elseif field.queryFormType == 'radio'>
-                        <#if field.queryDict??>
-                            <fast-radio-group v-model="state.queryForm.${field.attrName}"
-                                              dict-type="${field.queryDict}"></fast-radio-group>
-                        <#else>
-                            <el-radio-group v-model="state.queryForm.${field.attrName}">
-                                <el-radio :label="0">单选</el-radio>
-                            </el-radio-group>
-                        </#if>
-                    <#elseif field.queryFormType == 'date'>
-                        <el-date-picker
-                                v-model="daterange"
-                                type="daterange"
-                                value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                    <#elseif field.queryFormType == 'datetime'>
-                        <el-date-picker
-                                v-model="datetimerange"
-                                type="datetimerange"
-                                value-format="yyyy-MM-dd HH:mm:ss">
-                        </el-date-picker>
-                    <#else>
-                        <el-input v-model="state.queryForm.${field.attrName}"
-                                  placeholder="${field.fieldComment!}"></el-input>
-                    </#if>
-                </el-form-item>
-            </#list>
-            <el-form-item>
-                <el-button @click="getDataList()">查询</el-button>
-            </el-form-item>
-            <el-form-item>
-                <el-button v-auth="'${moduleName}:${functionName}:save'" type="primary" @click="addOrUpdateHandle()">
-                    新增
-                </el-button>
-            </el-form-item>
-            <el-form-item>
-                <el-button v-auth="'${moduleName}:${functionName}:delete'" type="danger" @click="deleteBatchHandle()">
-                    删除
-                </el-button>
-            </el-form-item>
-        </el-form>
-        <el-table v-loading="state.dataListLoading" :data="state.dataList" border style="width: 100%"
-                  @selection-change="selectionChangeHandle">
-            <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-            <#list gridList as field>
-                <#if field.formDict??>
-                    <fast-table-column prop="${field.attrName}" label="${field.fieldComment!}"
-                                       dict-type="${field.formDict}"></fast-table-column>
-                <#else>
-                    <el-table-column prop="${field.attrName}" label="${field.fieldComment!}" header-align="center"
-                                     align="center"></el-table-column>
-                </#if>
-            </#list>
-            <el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
-                <template #default="scope">
-                    <el-button v-auth="'${moduleName}:${functionName}:update'" type="primary" link
-                               @click="addOrUpdateHandle(scope.row.id)">修改
-                    </el-button>
-                    <el-button v-auth="'${moduleName}:${functionName}:delete'" type="primary" link
-                               @click="deleteBatchHandle(scope.row.id)">删除
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-                :current-page="state.page"
-                :page-sizes="state.pageSizes"
-                :page-size="state.limit"
-                :total="state.total"
-                layout="total, sizes, prev, pager, next, jumper"
-                @size-change="sizeChangeHandle"
-                @current-change="currentChangeHandle"
-        >
-        </el-pagination>
+	<el-card>
+		<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList()">
+		<#list queryList as field>
+			<el-form-item>
+			<#if field.formType == 'text' || field.formType == 'textarea' || field.formType == 'editor'>
+			  <el-input v-model="state.queryForm.${field.attrName}" placeholder="${field.fieldComment!}"></el-input>
+			<#elseif field.queryFormType == 'select'>
+			  <#if field.queryDict??>
+			  <fast-select v-model="state.queryForm.${field.attrName}" dict-type="${field.queryDict}" placeholder="${field.fieldComment!}" clearable></fast-select>
+			  <#else>
+			  <el-select v-model="state.queryForm.${field.attrName}" placeholder="${field.fieldComment!}">
+				<el-option label="选择" value="0"></el-option>
+			  </el-select>
+			  </#if>
+			<#elseif field.queryFormType == 'radio'>
+			  <#if field.queryDict??>
+			  <fast-radio-group v-model="state.queryForm.${field.attrName}" dict-type="${field.queryDict}"></fast-radio-group>
+			  <#else>
+			  <el-radio-group v-model="state.queryForm.${field.attrName}">
+				<el-radio :label="0">单选</el-radio>
+			  </el-radio-group>
+			  </#if>
+			<#elseif field.queryFormType == 'date'>
+			  <el-date-picker
+				v-model="daterange"
+				type="daterange"
+				value-format="yyyy-MM-dd">
+			  </el-date-picker>
+			<#elseif field.queryFormType == 'datetime'>
+			  <el-date-picker
+				v-model="datetimerange"
+				type="datetimerange"
+				value-format="yyyy-MM-dd HH:mm:ss">
+			  </el-date-picker>
+			<#else>
+			  <el-input v-model="state.queryForm.${field.attrName}" placeholder="${field.fieldComment!}"></el-input>
+			</#if>
+			</el-form-item>
+		  </#list>
+			<el-form-item>
+				<el-button @click="getDataList()">查询</el-button>
+			</el-form-item>
+			<el-form-item>
+				<el-button v-auth="'${moduleName}:${functionName}:save'" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+			</el-form-item>
+			<el-form-item>
+				<el-button v-auth="'${moduleName}:${functionName}:delete'" type="danger" @click="deleteBatchHandle()">删除</el-button>
+			</el-form-item>
+		</el-form>
+		<el-table v-loading="state.dataListLoading" :data="state.dataList" border style="width: 100%" @selection-change="selectionChangeHandle">
+			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+	    <#list gridList as field>
+		  <#if field.formDict??>
+			<fast-table-column prop="${field.attrName}" label="${field.fieldComment!}" dict-type="${field.formDict}"></fast-table-column>
+		  <#else>
+			<el-table-column prop="${field.attrName}" label="${field.fieldComment!}" header-align="center" align="center"></el-table-column>
+		  </#if>
+        </#list>
+			<el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
+				<template #default="scope">
+					<el-button v-auth="'${moduleName}:${functionName}:update'" type="primary" link @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+					<el-button v-auth="'${moduleName}:${functionName}:delete'" type="primary" link @click="deleteBatchHandle(scope.row.id)">删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<el-pagination
+			:current-page="state.page"
+			:page-sizes="state.pageSizes"
+			:page-size="state.limit"
+			:total="state.total"
+			layout="total, sizes, prev, pager, next, jumper"
+			@size-change="sizeChangeHandle"
+			@current-change="currentChangeHandle"
+		>
+		</el-pagination>
 
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update ref="addOrUpdateRef" @refreshDataList="getDataList"></add-or-update>
-    </el-card>
+		<!-- 弹窗, 新增 / 修改 -->
+		<add-or-update ref="addOrUpdateRef" @refreshDataList="getDataList"></add-or-update>
+	</el-card>
 </template>
 
 <script setup lang="ts" name="${ModuleName}${FunctionName}Index">
-	import {useCrud} from '@/hooks'
-	import {reactive, ref} from 'vue'
-	import {IHooksOptions} from '@/hooks/interface'
+import { useCrud } from '@/hooks'
+import { reactive, ref } from 'vue'
+import AddOrUpdate from './add-or-update.vue'
+import { IHooksOptions } from '@/hooks/interface'
 
-	const state: IHooksOptions = reactive({
-        dataListUrl: '/${moduleName}/${functionName}/page',
-        deleteUrl: '/${moduleName}/${functionName}',
-        queryForm: {
-            <#list queryList as field>
-            <#if field.formType == 'date'>
-            startDate: '',
-            endDate: ''<#sep>, </#sep>
-            <#elseif field.formType == 'datetime'>
-            startDateTime: '',
-            endDateTime: ''<#sep>, </#sep>
-            <#else>
-            ${field.attrName}: ''<#sep>, </#sep>
-            </#if>
-            </#list>
-        }
-    })
+const state: IHooksOptions = reactive({
+	dataListUrl: '/${moduleName}/${functionName}/page',
+	deleteUrl: '/${moduleName}/${functionName}',
+	queryForm: {
+		<#list queryList as field>
+		<#if field.formType == 'date'>
+		startDate: '',
+		endDate: ''<#sep>, </#sep>
+		<#elseif field.formType == 'datetime'>
+		startDateTime: '',
+		endDateTime: ''<#sep>, </#sep>
+		<#else>
+		${field.attrName}: ''<#sep>, </#sep>
+		</#if>
+		</#list>
+	}
+})
 
-    const addOrUpdateRef = ref()
-    const addOrUpdateHandle = (id
-    ? : number
-    ) =>
-    {
-        addOrUpdateRef.value.init(id)
-    }
+const addOrUpdateRef = ref()
+const addOrUpdateHandle = (id?: number) => {
+	addOrUpdateRef.value.init(id)
+}
 
-    const {
-        getDataList,
-        selectionChangeHandle,
-        sizeChangeHandle,
-        currentChangeHandle,
-        deleteBatchHandle
-    } = useCrud(state)
+const { getDataList, selectionChangeHandle, sizeChangeHandle, currentChangeHandle, deleteBatchHandle } = useCrud(state)
 </script>