代码生成模板优化

ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs

@@ -170,7 +170,7 @@ namespace ZR.Admin.WebApi.Controllers
                     GenTable genTable = new()
                     {
                         BaseNameSpace = "ZR.",//导入默认命名空间前缀
-                        ModuleName = "bus",//导入默认模块名
+                        ModuleName = "business",//导入默认模块名
                         ClassName = CodeGeneratorTool.GetClassName(tableName),
                         BusinessName = CodeGeneratorTool.GetClassName(tableName),
                         FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author),

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt

@@ -21,7 +21,7 @@ namespace {ApiControllerNamespace}.Controllers
     /// 代码自动生成
     /// </summary>
     [Verify]
-    [Route("bus/{ModelName}")]
+    [Route("{ModuleName}/{ModelName}")]
     public class {ModelName}Controller: BaseController
 	{
         /// <summary>

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt

@@ -6,7 +6,7 @@
    */
 export function list{ModelTypeName}(query) {
   return request({
-    url: 'bus/{ModelTypeName}/list',
+    url: '{ModuleName}/{ModelTypeName}/list',
     method: 'get',
     params: query,
   })
@@ -18,7 +18,7 @@ export function list{ModelTypeName}(query) {
    */
 export function add{ModelTypeName}(data) {
   return request({
-    url: '/bus/{ModelTypeName}',
+    url: '{ModuleName}/{ModelTypeName}',
     method: 'post',
     data: data,
   })
@@ -30,7 +30,7 @@ export function add{ModelTypeName}(data) {
    */
 export function update{ModelTypeName}(data) {
   return request({
-    url: '/bus/{ModelTypeName}',
+    url: '{ModuleName}/{ModelTypeName}',
     method: 'PUT',
     data: data,
   })
@@ -42,7 +42,7 @@ export function update{ModelTypeName}(data) {
    */
 export function get{ModelTypeName}(id) {
   return request({
-    url: '/bus/{ModelTypeName}/' + id,
+    url: '{ModuleName}/{ModelTypeName}/' + id,
     method: 'get'
   })
 }
@@ -53,7 +53,7 @@ export function get{ModelTypeName}(id) {
    */
 export function del{ModelTypeName}(pid) {
   return request({
-    url: '/bus/{ModelTypeName}/' + pid,
+    url: '{ModuleName}/{ModelTypeName}/' + pid,
     method: 'delete'
   })
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt

@@ -19,14 +19,14 @@
         <el-button type="success" :disabled="single" v-hasPermi="['{Permission}:update']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" v-hasPermi="['{Permission}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['{Permission}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 数据区域 -->
     <el-table :data="dataList" ref="table" border  @selection-change="handleSelectionChange">
-	  <el-table-column type="selection" width="50" />
+      <el-table-column type="selection" width="50" />
       {VueViewListContent}
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -220,7 +220,7 @@ namespace ZR.CodeGenerator
             string columnName = dbFieldInfo.ColumnName;
             string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
             string vueViewListContent = "";
-            string showToolTip = dbFieldInfo.ColumnType.Contains("varchar") ? ":show-overflow-tooltip=\"true\"" : "";
+            string showToolTip = dbFieldInfo.CsharpType == "string" ? ":show-overflow-tooltip=\"true\"" : "";
             string formatter = !string.IsNullOrEmpty(dbFieldInfo.DictType) ? $" :formatter=\"{columnName}Format\"" : "";
             
             if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -163,11 +163,8 @@ namespace ZR.CodeGenerator
                 WriteAndSave(tuple.Item1, tuple.Item2);
             }
             return genPathList;
-            //GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
-            //GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered);
         }
 
-
         #region 生成Model
 
         /// <summary>
@@ -312,7 +309,7 @@ namespace ZR.CodeGenerator
         /// </summary>
         private static Tuple<string, string> GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", "business");
+            var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", generateDto.GenTable.ModuleName);
             CreateDirectory(servicesPath);
 
             var fullPath = Path.Combine(servicesPath, $"{replaceDto.ModelTypeName}Controller.cs");
@@ -329,6 +326,7 @@ namespace ZR.CodeGenerator
                 .Replace("{PrimaryKey}", replaceDto.PKName)
                 .Replace("{UpdateColumn}", replaceDto.UpdateColumn)
                 .Replace("{InsertColumn}", replaceDto.InsertColumn)
+                .Replace("{ModuleName}", generateDto.GenTable.ModuleName)
                 .Replace("{PKCsharpType}", replaceDto.PKType);
 
             return Tuple.Create(fullPath, content);
@@ -341,10 +339,10 @@ namespace ZR.CodeGenerator
         private static Tuple<string, string> GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
         {
             var parentPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src");
-            var servicesPath = Path.Combine(parentPath, "views", replaceDto.ViewsFileName);
+            var servicesPath = Path.Combine(parentPath, "views", generateDto.GenTable.ModuleName, replaceDto.ViewsFileName);
             CreateDirectory(servicesPath);
 
-            var fullPath = Path.Combine(servicesPath, $"{replaceDto.ViewsFileName}.vue");
+            var fullPath = Path.Combine(servicesPath, "index.vue");
 
             if (File.Exists(fullPath) && !generateDto.coverd)
                 return Tuple.Create(fullPath, "");
@@ -379,7 +377,8 @@ namespace ZR.CodeGenerator
 
             var content = ReadTemplate("VueJsTemplate.txt")
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
-                .Replace("{ModelTypeDesc}", replaceDto.TableDesc);
+                .Replace("{ModelTypeDesc}", replaceDto.TableDesc)
+                .Replace("{ModuleName}", generateDto.GenTable.ModuleName);
 
             return Tuple.Create(fullPath, content);
         }
@@ -618,7 +617,7 @@ namespace ZR.CodeGenerator
             try
             {
                 //生成压缩包
-                string zipReturnFileName = "ZR." + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
+                string zipReturnFileName = dto.GenTable.BaseNameSpace + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
 
                 CreateDirectory(dto.GenCodePath);
                 string zipFileName = Path.Combine(dto.ZipPath, zipReturnFileName);

ZR.Vue/src/api/gendemo.js

@@ -1,59 +0,0 @@
-import request from '@/utils/request'
-
-/**
-   * 分页查询
-   * @param {查询条件} data
-   */
-export function listGendemo(data) {
-  return request({
-    url: '/bus/Gendemo/list',
-    method: 'get',
-    params: data,
-  })
-}
-
-/**
-   * 新增
-   * @param data
-   */
-export function addGendemo(data) {
-  return request({
-    url: '/bus/Gendemo',
-    method: 'post',
-    data: data,
-  })
-}
-
-/**
-   * 修改
-   * @param data
-   */
-export function updateGendemo(data) {
-  return request({
-    url: '/bus/Gendemo',
-    method: 'PUT',
-    data: data,
-  })
-}
-
-/**
-   * 获取详情
-   * @param {Id} Id
-   */
-export function getGendemo(id) {
-  return request({
-    url: '/bus/Gendemo/' + id,
-    method: 'get'
-  })
-}
-
-/**
-   * 删除
-   * @param {主键} pid
-   */
-export function delGendemo(pid) {
-  return request({
-    url: '/bus/Gendemo/' + pid,
-    method: 'delete'
-  })
-}

ZR.Vue/src/views/gendemo/index.vue

@@ -1,278 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
-
-      <el-row class="mb8" style="text-align:center">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-row>
-    </el-form>
-
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['gendemo:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['gendemo:update']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" v-hasPermi="['gendemo:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 数据区域 -->
-    <el-table :data="dataList" ref="table" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" />
-      <el-table-column prop="id" label="自增id" align="center" />
-      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="icon" label="图片">
-        <template slot-scope="scope">
-          <el-image class="table-td-thumb" :src="scope.row.icon" :preview-src-list="[scope.row.icon]"></el-image>
-        </template>
-      </el-table-column>
-      <el-table-column prop="showStatus" label="显示状态" align="center" />
-      <el-table-column prop="addTime" label="添加时间" align="center" />
-      <el-table-column prop="sex" label="用户性别" align="center" :formatter="sexFormat" />
-      <el-table-column prop="sort" label="排序" align="center" />
-
-      <el-table-column label="操作" align="center" width="200">
-        <template slot-scope="scope">
-          <el-button v-hasPermi="['gendemo:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-popconfirm title="确定删除吗？" @confirm="handleDelete(scope.row)" style="margin-left:10px">
-            <el-button slot="reference" v-hasPermi="['gendemo:delete']" type="text" icon="el-icon-delete">删除</el-button>
-          </el-popconfirm>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
-    <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
-      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
-        <el-form-item label="名称" :label-width="labelWidth" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="图片" :label-width="labelWidth" prop="icon">
-          <el-upload class="avatar-uploader" name="file" action="/api/upload/saveFile/" :show-file-list="false" :on-success="handleUploadIconSuccess" :before-upload="beforeFileUpload">
-            <img v-if="form.icon" :src="form.icon" class="icon">
-            <i v-else class="el-icon-plus uploader-icon"></i>
-          </el-upload>
-          <el-input v-model="form.icon" placeholder="请上传文件或手动输入文件地址"></el-input>
-        </el-form-item>
-        <el-form-item label="显示状态" :label-width="labelWidth" prop="showStatus">
-          <el-radio-group v-model="form.showStatus">
-            <el-radio :key="1" :label="1">是</el-radio>
-            <el-radio :key="0" :label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="用户性别" :label-width="labelWidth" prop="sex">
-          <el-select v-model="form.sex">
-            <el-option v-for="item in sexOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="排序" :label-width="labelWidth" prop="sort">
-          <el-input v-model.number="form.sort" placeholder="请输入排序" />
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer" v-if="btnSubmitVisible">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-<script>
-import {
-  listGendemo,
-  addGendemo,
-  delGendemo,
-  updateGendemo,
-  getGendemo,
-} from "@/api/gendemo.js";
-
-export default {
-  name: "Gendemo",
-  data() {
-    return {
-      labelWidth: "100px",
-      formLabelWidth: "100px",
-      // 选中id数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 查询参数
-      queryParams: {},
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 表单参数
-      form: {},
-      // 时间范围数组
-      timeRange: [],
-      // 用户性别选项列表
-      sexOptions: [],
-      // 数据列表
-      dataList: [],
-      // 总记录数
-      total: 0,
-      // 提交按钮是否显示
-      btnSubmitVisible: true,
-      // 表单校验
-      rules: {
-        id: [{ type: "number", message: "id必须为数字值", trigger: "blur" }],
-        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        showStatus: [
-          { required: true, message: "请输入显示状态", trigger: "blur" },
-        ],
-      },
-    };
-  },
-  mounted() {
-    // 列表数据查询
-    this.getList();
-    // 下拉框绑定
-    // this.getDicts("sys_normal_disable").then((response) => {
-    //   this.statusOptions = response.data;
-    // });
-    this.getDicts("sys_user_sex").then((response) => {
-      this.sexOptions = response.data;
-    });
-  },
-  methods: {
-    // 查询数据
-    getList() {
-      console.log(JSON.stringify(this.queryParams));
-      listGendemo(this.addDateRange(this.queryParams, this.timeRange)).then(
-        (res) => {
-          if (res.code == 200) {
-            this.dataList = res.data.result;
-            this.total = res.data.totalCount;
-          }
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 重置数据表单
-    reset() {
-      this.form = {
-        name: undefined,
-        icon: undefined,
-        showStatus: undefined,
-        addTime: undefined,
-        sex: undefined,
-        sort: undefined,
-
-        //TODO 根据实际内容调整
-      };
-      this.resetForm("form");
-    },
-    /** 重置查询操作 */
-    resetQuery() {
-      this.timeRange = [];
-      this.resetForm("queryForm");
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 20,
-        //TODO 重置字段
-      };
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    /** 选择每页显示数量*/
-    handleSizeChange(val) {
-      this.queryParams.pageSize = val;
-      this.queryParams.pageNum = 1;
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加";
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      delGendemo(ids.toString()).then((res) => {
-        this.msgSuccess("删除成功");
-        this.handleQuery();
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getGendemo(id).then((res) => {
-        if (res.code == 200) {
-          this.form = res.data;
-          this.open = true;
-          this.title = "修改数据";
-        }
-      });
-    },
-    beforeFileUpload(file) {},
-    //文件上传成功方法
-    handleUploadIconSuccess(res, file) {
-      this.form.icon = URL.createObjectURL(file.raw);
-      // this.$refs.upload.clearFiles();
-    },
-    // 用户性别字典翻译
-    sexFormat(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex);
-    },
-
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          console.log(JSON.stringify(this.form));
-
-          if (this.form.id != undefined || this.title === "修改数据") {
-            updateGendemo(this.form).then((res) => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addGendemo(this.form).then((res) => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-  },
-};
-</script>
-<style scoped>
-.table-td-thumb {
-  width: 80px;
-}
-</style>

ZRAdmin.xml

@@ -27,47 +27,6 @@
             <param name="data"></param>
             <returns></returns>
         </member>
-        <member name="T:ZR.Admin.WebApi.Controllers.UserInfoController">
-            <summary>
-            代码自动生成
-            </summary>
-        </member>
-        <member name="F:ZR.Admin.WebApi.Controllers.UserInfoController._UserInfoService">
-            <summary>
-            用户信息接口
-            </summary>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.QueryUserInfo(ZR.Model.Dto.UserInfoQueryDto)">
-            <summary>
-            查询用户信息列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.GetUserInfo(System.Int32)">
-            <summary>
-            查询用户信息详情
-            </summary>
-            <param name="Luid"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.AddUserInfo(ZR.Model.Dto.UserInfoDto)">
-            <summary>
-            添加用户信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.UpdateUserInfo(ZR.Model.Dto.UserInfoDto)">
-            <summary>
-            更新用户信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:ZR.Admin.WebApi.Controllers.UserInfoController.DeleteUserInfo(System.String)">
-            <summary>
-            删除用户信息
-            </summary>
-            <returns></returns>
-        </member>
         <member name="T:ZR.Admin.WebApi.Controllers.CodeGeneratorController">
             <summary>
             代码生成