From 3cf3a06a683ab07da2e627015acc00395397ba1e Mon Sep 17 00:00:00 2001
From: Ky10 <7703482+ky10_code@user.noreply.gitee.com>
Date: Thu, 8 Aug 2024 18:15:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

前后端生成代码模版修复bug保证生成完成的代码。复制进代码中就可以直接运行。
---
 .../resources/templates/generator/api.ts.vm   |   2 +-
 .../templates/generator/controller.java.vm    |  15 +-
 .../templates/generator/index.vue.vm          | 394 ------------------
 .../templates/generator/mapper.java.vm        |   1 +
 .../templates/generator/query.java.vm         |   2 +-
 .../templates/generator/service.java.vm       |   4 +-
 .../templates/generator/serviceImpl.java.vm   |   6 +-
 7 files changed, 16 insertions(+), 408 deletions(-)

diff --git a/src/main/resources/templates/generator/api.ts.vm b/src/main/resources/templates/generator/api.ts.vm
index 23141d3d..beef2638 100644
--- a/src/main/resources/templates/generator/api.ts.vm
+++ b/src/main/resources/templates/generator/api.ts.vm
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-const ${entityName.toUpperCase()}_BASE_URL = "/api/v1/${entityName.toLowerCase()}s";
+const ${entityName.toUpperCase()}_BASE_URL = "/api/v1/${lowerFirstEntityName}s";
 
 class ${entityName}API {
     /** 获取${businessName}分页数据 */
diff --git a/src/main/resources/templates/generator/controller.java.vm b/src/main/resources/templates/generator/controller.java.vm
index fd3b999e..570ee664 100644
--- a/src/main/resources/templates/generator/controller.java.vm
+++ b/src/main/resources/templates/generator/controller.java.vm
@@ -1,14 +1,15 @@
 package ${packageName}.${moduleName}.${subpackageName};
 
+import ${packageName}.${moduleName}.service.${entityName}Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import ${packageName}.${moduleName}.model.form.${entityName}Form;
-import ${packageName}.${moduleName}.model.query.${entityName}PageQuery;
-import ${packageName}.${moduleName}.model.vo.${entityName}PageVO;
+import ${packageName}.${moduleName}.model.query.${entityName}Query;
+import ${packageName}.${moduleName}.model.vo.${entityName}VO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.youlai.common.result.PageResult;
-import com.youlai.common.result.Result;
+import com.youlai.system.common.result.PageResult;
+import com.youlai.system.common.result.Result;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,13 +30,13 @@ import jakarta.validation.Valid;
 @RequiredArgsConstructor
 public class ${entityName}Controller  {
 
-    private final ${entityName}Serivie ${lowerFirstEntityName}Service;
+    private final ${entityName}Service ${lowerFirstEntityName}Service;
 
     @Operation(summary = "$!{businessName}分页列表")
     @GetMapping("/page")
     @PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:query')")
-    public PageResult<${entityName}PageVO> get${entityName}Page(${entityName}PageQuery queryParams ) {
-        IPage<${entityName}PageVO> result = ${lowerFirstEntityName}Service.get${entityName}Page(queryParams);
+    public PageResult<${entityName}VO> get${entityName}Page(${entityName}Query queryParams ) {
+        IPage<${entityName}VO> result = ${lowerFirstEntityName}Service.get${entityName}Page(queryParams);
         return PageResult.success(result);
     }
 
diff --git a/src/main/resources/templates/generator/index.vue.vm b/src/main/resources/templates/generator/index.vue.vm
index 471f23f2..e69de29b 100644
--- a/src/main/resources/templates/generator/index.vue.vm
+++ b/src/main/resources/templates/generator/index.vue.vm
@@ -1,394 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        #foreach($fieldConfig in $fieldConfigs)
-          #if($fieldConfig.isShowInQuery == 1)
-            <el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
-              #if($fieldConfig.formType == "INPUT")
-                <el-input
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  placeholder="$fieldConfig.fieldComment"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
-              #elseif($fieldConfig.formType == "SELECT")
-                #if($fieldConfig.dictType != "")
-                  <dictionary v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
-                #else
-                  <el-select v-model="formData.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
-                    <el-option :key="1" :value="1" label="选项一"/>
-                    <el-option :key="2" :value="2" label="选项二"/>
-                  </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>
-              #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>
-              #elseif($fieldConfig.formType == "INPUT_NUMBER")
-                <el-input-number
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  placeholder="$fieldConfig.fieldComment"
-                />
-              #elseif($fieldConfig.formType == "SWITCH")
-                <el-switch
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  :active-value="1"
-                  :inactive-value="0"
-                />
-              #elseif($fieldConfig.formType == "TEXT_AREA")
-                <el-input type="textarea"
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  placeholder="$fieldConfig.fieldComment"
-                />
-              #elseif($fieldConfig.formType == "DATE_TIME")
-                <el-date-picker
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  #if($fieldConfig.queryType == "BETWEEN")
-                  type="daterange"
-                  range-separator="~"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  #else
-                  type="datetime"
-                  placeholder="$fieldConfig.fieldComment"
-                  #end
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              #elseif($fieldConfig.formType == "DATE")
-                <el-date-picker
-                  class="!w-[240px]"
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  #if($fieldConfig.queryType == "BETWEEN")
-                  type="daterange"
-                  range-separator="~"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  #else
-                  type="date"
-                  placeholder="$fieldConfig.fieldComment"
-                  #end
-                  value-format="YYYY-MM-DD"
-                />
-              #end
-            </el-form-item>
-          #end
-        #end
-        <el-form-item>
-          <el-button type="primary" @click="handleQuery"><i-ep-search />搜索</el-button>
-          <el-button @click="handleResetQuery"><i-ep-refresh />重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <el-card shadow="never" class="table-container">
-      <template #header>
-        <el-button
-          v-hasPerm="['${moduleName}:${lowerFirstEntityName}:add']"
-          type="success"
-          @click="handleOpenDialog"
-        >
-          <i-ep-plus />
-          新增
-        </el-button>
-        <el-button
-          v-hasPerm="['${moduleName}:${lowerFirstEntityName}:delete']"
-          type="danger"
-          :disabled="ids.length === 0"
-          @click="handleDelete"
-        ><i-ep-delete />
-          删除
-        </el-button>
-      </template>
-
-      <el-table
-        ref="dataTableRef"
-        v-loading="loading"
-        :data="pageData"
-        highlight-current-row
-        border
-        @selection-change="handleSelectionChange"
-      >
-        <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="100"
-        />
-          #end
-        #end
-        <el-table-column fixed="right" label="操作" width="220">
-          <template #default="scope">
-            <el-button
-              v-hasPerm="['${moduleName}:${lowerFirstEntityName}:edit']"
-              type="primary"
-              size="small"
-              link
-              @click="handleOpenDialog(scope.row.id)"
-            >
-              <i-ep-edit />
-              编辑
-            </el-button>
-            <el-button
-              v-hasPerm="['${moduleName}:${lowerFirstEntityName}:delete']"
-              type="danger"
-              size="small"
-              link
-              @click="handleDelete(scope.row.id)"
-            >
-              <i-ep-delete />
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-if="total > 0"
-        v-model:total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
-      />
-    </el-card>
-
-    <!-- $!{businessName}表单弹窗 -->
-    <el-dialog
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="500px"
-      @close="handleCloseDialog"
-    >
-      <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
-        #foreach($fieldConfig in $fieldConfigs)
-          #if($fieldConfig.isShowInForm == 1)
-            <el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
-              #if($fieldConfig.formType == "INPUT")
-                <el-input
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  placeholder="$fieldConfig.fieldComment"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
-              #elseif($fieldConfig.formType == "SELECT")
-                #if($fieldConfig.dictType != "")
-                  <dictionary v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
-                #else
-                  <el-select v-model="formData.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
-                    <el-option :value="0" label="选项一"/>
-                    <el-option :value="1" label="选项二"/>
-                  </el-select>
-                #end
-              #elseif($fieldConfig.formType == "RADIO")
-                <el-radio-group v-model="queryParams.$fieldConfig.fieldName">
-                  <el-radio :value="0">选项一</el-radio>
-                  <el-radio :value="1">选项二</el-radio>
-                </el-radio-group>
-              #elseif($fieldConfig.formType == "CHECK_BOX")
-                <el-checkbox-group v-model="queryParams.$fieldConfig.fieldName">
-                  <el-checkbox :value="0">选项一</el-checkbox>
-                  <el-checkbox :value="1">选项二</el-checkbox>
-                </el-checkbox-group>
-              #elseif($fieldConfig.formType == "INPUT_NUMBER")
-                <el-input-number
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  placeholder="$fieldConfig.fieldComment"
-                />
-              #elseif($fieldConfig.formType == "SWITCH")
-                <el-switch
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  :active-value="1"
-                  :inactive-value="0"
-                />
-              #elseif($fieldConfig.formType == "TEXT_AREA")
-                <el-input type="textarea"
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  placeholder="$fieldConfig.fieldComment"
-                />
-              #elseif($fieldConfig.formType == "DATE_TIME")
-                <el-date-picker
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  type="datetime"
-                  placeholder="$fieldConfig.fieldComment"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
-              #elseif($fieldConfig.formType == "DATE")
-                <el-date-picker
-                  class="!w-[240px]"
-                  v-model="queryParams.$fieldConfig.fieldName"
-                  type="date"
-                  placeholder="$fieldConfig.fieldComment"
-                  value-format="YYYY-MM-DD"
-                />
-              #end
-            </el-form-item>
-          #end
-        #end
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="handleSubmit">确定</el-button>
-          <el-button @click="handleCloseDialog">取消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-  defineOptions({
-    name: "${entityName}",
-    inheritAttrs: false,
-  });
-
-  import ${entityName}API, { ${entityName}PageVO, ${entityName}Form, ${entityName}PageQuery } from "@/api/${lowerFirstEntityName}";
-
-  const queryFormRef = ref(ElForm);
-  const dataFormRef = ref(ElForm);
-
-  const loading = ref(false);
-  const ids = ref<number[]>([]);
-  const total = ref(0);
-
-  const queryParams = reactive<${entityName}PageQuery>({
-    pageNum: 1,
-    pageSize: 10,
-  });
-
-  // $!{businessName}表格数据
-  const pageData = ref<${entityName}PageVO[]>([]);
-
-  // 弹窗
-  const dialog = reactive({
-    title: "",
-    visible: false,
-  });
-
-  // $!{businessName}表单数据
-  const formData = reactive<${entityName}Form>({});
-
-  // $!{businessName}表单校验规则
-  const rules = reactive({
-    #if($fieldConfigs)
-      #foreach($fieldConfig in ${fieldConfigs})
-        #if($fieldConfig.isShowInForm && $fieldConfig.isRequired)
-        ${fieldConfig.fieldName}: [{ required: true, message: "请输入${fieldConfig.fieldComment}", trigger: "blur" }],
-        #end
-      #end
-    #end
-  });
-
-  /** 查询$!{businessName} */
-  function handleQuery() {
-    loading.value = true;
-    ${entityName}API.getPage(queryParams)
-            .then((data) => {
-              pageData.value = data.list;
-              total.value = data.total;
-            })
-            .finally(() => {
-              loading.value = false;
-            });
-  }
-
-  /** 重置$!{businessName}查询 */
-  function handleResetQuery() {
-    queryFormRef.value!.resetFields();
-    queryParams.pageNum = 1;
-    handleQuery();
-  }
-
-  /** 行复选框选中记录选中ID集合 */
-  function handleSelectionChange(selection: any) {
-    ids.value = selection.map((item: any) => item.id);
-  }
-
-  /** 打开$!{businessName}弹窗 */
-  function handleOpenDialog(id?: number) {
-    dialog.visible = true;
-    if (id) {
-      dialog.title = "修改$!{businessName}";
-      ${entityName}API.getFormData(id).then((data) => {
-        Object.assign(formData, data);
-      });
-    } else {
-      dialog.title = "新增$!{businessName}";
-    }
-  }
-
-  /** 提交$!{businessName}表单 */
-  function handleSubmit() {
-    dataFormRef.value.validate((valid: any) => {
-      if (valid) {
-        loading.value = true;
-        const id = formData.id;
-        if (id) {
-          ${entityName}API.update(id, formData)
-                  .then(() => {
-                    ElMessage.success("修改成功");
-                    handleCloseDialog();
-                    handleResetQuery();
-                  })
-                  .finally(() => (loading.value = false));
-        } else {
-          ${entityName}API.add(formData)
-                  .then(() => {
-                    ElMessage.success("新增成功");
-                    handleCloseDialog();
-                    handleResetQuery();
-                  })
-                  .finally(() => (loading.value = false));
-        }
-      }
-    });
-  }
-
-  /** 关闭$!{businessName}弹窗 */
-  function handleCloseDialog() {
-    dialog.visible = false;
-    dataFormRef.value.resetFields();
-    dataFormRef.value.clearValidate();
-    formData.id = undefined;
-  }
-
-  /** 删除$!{businessName} */
-  function handleDelete(id?: number) {
-    const ids = [id || ids.value].join(",");
-    if (!ids) {
-      ElMessage.warning("请勾选删除项");
-      return;
-    }
-
-    ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    }).then(
-            () => {
-              loading.value = true;
-              ${entityName}API.deleteByIds(ids)
-                      .then(() => {
-                        ElMessage.success("删除成功");
-                        handleResetQuery();
-                      })
-                      .finally(() => (loading.value = false));
-            },
-            () => {
-              ElMessage.info("已取消删除");
-            }
-    );
-  }
-
-  onMounted(() => {
-    handleQuery();
-  });
-</script>
diff --git a/src/main/resources/templates/generator/mapper.java.vm b/src/main/resources/templates/generator/mapper.java.vm
index 82b0ee9c..ca4eedd8 100644
--- a/src/main/resources/templates/generator/mapper.java.vm
+++ b/src/main/resources/templates/generator/mapper.java.vm
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.${moduleName}.model.entity.${entityName};
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import ${packageName}.${moduleName}.model.query.${entityName}Query;
+import ${packageName}.${moduleName}.model.vo.${entityName}VO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/src/main/resources/templates/generator/query.java.vm b/src/main/resources/templates/generator/query.java.vm
index 819d9c3e..e343fadd 100644
--- a/src/main/resources/templates/generator/query.java.vm
+++ b/src/main/resources/templates/generator/query.java.vm
@@ -1,6 +1,6 @@
 package ${packageName}.${moduleName}.${subpackageName};
 
-import com.youlai.common.base.BasePageQuery;
+import com.youlai.system.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/resources/templates/generator/service.java.vm b/src/main/resources/templates/generator/service.java.vm
index 22d6001e..08dec1b7 100644
--- a/src/main/resources/templates/generator/service.java.vm
+++ b/src/main/resources/templates/generator/service.java.vm
@@ -2,8 +2,8 @@ package ${packageName}.${moduleName}.${subpackageName};
 
 import ${packageName}.${moduleName}.model.entity.${entityName};
 import ${packageName}.${moduleName}.model.form.${entityName}Form;
-import ${packageName}.${moduleName}.model.query.${entityName}PageQuery;
-import ${packageName}.${moduleName}.model.vo.${entityName}PageVO;
+import ${packageName}.${moduleName}.model.query.${entityName}Query;
+import ${packageName}.${moduleName}.model.vo.${entityName}VO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/src/main/resources/templates/generator/serviceImpl.java.vm b/src/main/resources/templates/generator/serviceImpl.java.vm
index ebe42c3f..6d74c712 100644
--- a/src/main/resources/templates/generator/serviceImpl.java.vm
+++ b/src/main/resources/templates/generator/serviceImpl.java.vm
@@ -10,7 +10,7 @@ import ${packageName}.${moduleName}.service.${entityName}Service;
 import ${packageName}.${moduleName}.model.entity.${entityName};
 import ${packageName}.${moduleName}.model.form.${entityName}Form;
 import ${packageName}.${moduleName}.model.query.${entityName}Query;
-import ${packageName}.${moduleName}.model.vo.${entityName}PageVO;
+import ${packageName}.${moduleName}.model.vo.${entityName}VO;
 import ${packageName}.${moduleName}.converter.${entityName}Converter;
 
 import java.util.Arrays;
@@ -36,7 +36,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
     * 获取${businessName}分页列表
     *
     * @param queryParams 查询参数
-    * @return {@link IPage<${entityName}PageVO>} $!{businessName}分页列表
+    * @return {@link IPage<${entityName}VO>} $!{businessName}分页列表
     */
     @Override
     public IPage<${entityName}VO> get${entityName}Page(${entityName}Query queryParams) {
@@ -44,7 +44,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
                 new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
                 queryParams
         );
-        returnv pageVO;
+        return pageVO;
     }
     
     /**