优化代码生成模板

2021-10-10 10:22:30 +08:00 · 2021-10-10 10:22:30 +08:00 · b6412e9e6e
commit b6412e9e6e
parent 8a9bea40bb
7 changed files with 370 additions and 20 deletions
--- a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
+++ b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
@ -14,6 +14,7 @@ using ZR.Service.Business;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Common;
+using Infrastructure.Extensions;

 namespace ZR.Admin.WebApi.Controllers
 {
@ -21,11 +22,11 @@ namespace ZR.Admin.WebApi.Controllers
    /// 代码生成演示Controller
    ///
    /// @author zr
-    /// @date 2021-09-27
+    /// @date 2021-10-10
    /// </summary>
    [Verify]
    [Route("business/Gendemo")]
-    public class GendemoController: BaseController
+    public class GendemoController : BaseController
    {
        /// <summary>
        /// 代码生成演示接口
@ -76,7 +77,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <returns></returns>
        [HttpPost]
        [ActionPermissionFilter(Permission = "business:gendemo:add")]
-        [Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
+        [Log(Title = "代码生成演示添加", BusinessType = BusinessType.INSERT)]
        public IActionResult AddGendemo([FromBody] GendemoDto parm)
        {
            if (parm == null)
@ -84,11 +85,15 @@ namespace ZR.Admin.WebApi.Controllers
                throw new CustomException("请求参数错误");
            }
            //从 Dto 映射到 实体
-            var model = parm.Adapt<Gendemo>().ToCreate();
+            var model = parm.Adapt<Gendemo>().ToCreate(HttpContext);

            return SUCCESS(_GendemoService.Add(model, it => new
            {
-                it.Name, it.Icon, it.ShowStatus, it.Sex, it.Sort, 
+                it.Name,
+                it.Icon,
+                it.ShowStatus,
+                it.Sex,
+                it.Sort,
            }));
        }

@ -98,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <returns></returns>
        [HttpPut]
        [ActionPermissionFilter(Permission = "business:gendemo:update")]
-        [Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
+        [Log(Title = "代码生成演示修改", BusinessType = BusinessType.UPDATE)]
        public IActionResult UpdateGendemo([FromBody] GendemoDto parm)
        {
            if (parm == null)
@ -106,12 +111,16 @@ namespace ZR.Admin.WebApi.Controllers
                throw new CustomException("请求实体不能为空");
            }
            //从 Dto 映射到 实体
-            var model = parm.Adapt<Gendemo>().ToUpdate();
+            var model = parm.Adapt<Gendemo>().ToUpdate(HttpContext);

            var response = _GendemoService.Update(w => w.Id == model.Id, it => new Gendemo()
            {
                //Update 字段映射
-                Name = model.Name, Icon = model.Icon, ShowStatus = model.ShowStatus, Sex = model.Sex, Sort = model.Sort, 
+                Name = model.Name,
+                Icon = model.Icon,
+                ShowStatus = model.ShowStatus,
+                Sex = model.Sex,
+                Sort = model.Sort,
            });

            return SUCCESS(response);
@ -123,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers
        /// <returns></returns>
        [HttpDelete("{ids}")]
        [ActionPermissionFilter(Permission = "business:gendemo:delete")]
-        [Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
+        [Log(Title = "代码生成演示删除", BusinessType = BusinessType.DELETE)]
        public IActionResult DeleteGendemo(string ids)
        {
            int[] idsArr = Tools.SpitIntArrary(ids);
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
@ -77,7 +77,7 @@ namespace {ApiControllerNamespace}.Controllers
        /// <returns></returns>
        [HttpPost]
        [ActionPermissionFilter(Permission = "{Permission}:add")]
-        [Log(Title = "{FunctionName}添加", BusinessType = BusinessType.INSERT)]
+        [Log(Title = "{FunctionName}", BusinessType = BusinessType.INSERT)]
        public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
        {
            if (parm == null)
@ -89,7 +89,7 @@ namespace {ApiControllerNamespace}.Controllers

            return SUCCESS(_{ModelName}Service.Add(model, it => new
            {
-                {InsertColumn}
+{InsertColumn}
            }));
        }

@ -99,7 +99,7 @@ namespace {ApiControllerNamespace}.Controllers
        /// <returns></returns>
        [HttpPut]
        [ActionPermissionFilter(Permission = "{Permission}:update")]
-        [Log(Title = "{FunctionName}修改", BusinessType = BusinessType.UPDATE)]
+        [Log(Title = "{FunctionName}", BusinessType = BusinessType.UPDATE)]
        public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
        {
            if (parm == null)
@ -112,7 +112,7 @@ namespace {ApiControllerNamespace}.Controllers
            var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
            {
                //Update 字段映射
-                {UpdateColumn}
+{UpdateColumn}
            });

            return SUCCESS(response);
@ -124,7 +124,7 @@ namespace {ApiControllerNamespace}.Controllers
        /// <returns></returns>
        [HttpDelete("{ids}")]
        [ActionPermissionFilter(Permission = "{Permission}:delete")]
-        [Log(Title = "{FunctionName}删除", BusinessType = BusinessType.DELETE)]
+        [Log(Title = "{FunctionName}", BusinessType = BusinessType.DELETE)]
        public IActionResult Delete{ModelName}(string ids)
        {
            int[] idsArr = Tools.SpitIntArrary(ids);
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@ -77,12 +77,12 @@ namespace ZR.CodeGenerator
                //编辑字段
                if (dbFieldInfo.IsEdit)
                {
-                    replaceDto.UpdateColumn += $"{dbFieldInfo.CsharpField} = model.{dbFieldInfo.CsharpField}, ";
+                    replaceDto.UpdateColumn += $"                {dbFieldInfo.CsharpField} = model.{dbFieldInfo.CsharpField}, \n";
                }
                //新增字段
                if (dbFieldInfo.IsInsert)
                {
-                    replaceDto.InsertColumn += $"it.{dbFieldInfo.CsharpField}, ";
+                    replaceDto.InsertColumn += $"                it.{dbFieldInfo.CsharpField}, \n";
                }
                //TODO 查询
                //if (dbFieldInfo.IsQuery)
@ -309,8 +309,8 @@ namespace ZR.CodeGenerator
                .Replace("{ModelName}", replaceDto.ModelTypeName)
                .Replace("{Permission}", replaceDto.Permission)
                .Replace("{PrimaryKey}", replaceDto.PKName)
-                .Replace("{UpdateColumn}", replaceDto.UpdateColumn)
-                .Replace("{InsertColumn}", replaceDto.InsertColumn)
+                .Replace("{UpdateColumn}", replaceDto.UpdateColumn.TrimEnd('\n'))
+                .Replace("{InsertColumn}", replaceDto.InsertColumn.TrimEnd('\n'))
                .Replace("{ModuleName}", generateDto.GenTable.ModuleName)
                .Replace("{PKCsharpType}", replaceDto.PKType)
                .Replace("{Author}", replaceDto.Author)
--- a/ZR.Vue/src/api/gendemo.js
+++ b/ZR.Vue/src/api/gendemo.js
@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+/**
+   * 代码生成演示分页查询
+   * @param {查询条件} data
+   */
+export function listGendemo(query) {
+  return request({
+    url: 'business/Gendemo/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+/**
+   * 新增代码生成演示
+   * @param data
+   */
+export function addGendemo(data) {
+  return request({
+    url: 'business/Gendemo',
+    method: 'post',
+    data: data,
+  })
+}
+
+/**
+   * 修改代码生成演示
+   * @param data
+   */
+export function updateGendemo(data) {
+  return request({
+    url: 'business/Gendemo',
+    method: 'PUT',
+    data: data,
+  })
+}
+
+/**
+   * 获取代码生成演示详情
+   * @param {Id} 代码生成演示Id
+   */
+export function getGendemo(id) {
+  return request({
+    url: 'business/Gendemo/' + id,
+    method: 'get'
+  })
+}
+
+/**
+   * 删除
+   * @param {主键} pid
+   */
+export function delGendemo(pid) {
+  return request({
+    url: 'business/Gendemo/' + pid,
+    method: 'delete'
+  })
+}
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@ -3,7 +3,7 @@ module.exports = {
  /**
   * 主题颜色
   */
-  theme: '#409EFF',
+  theme: '#13C2C2',
  /**
   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
   */
--- a/ZR.Vue/src/views/business/gendemo/index.vue
+++ b/ZR.Vue/src/views/business/gendemo/index.vue
@ -0,0 +1,282 @@
+<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-form-item label="名称" :label-width="labelWidth">
+        <el-input v-model="queryParams.name" />
+      </el-form-item>
+      <el-form-item label="时间">
+        <el-date-picker v-model="timeRange" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+
+      <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="['business: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="['business:gendemo:update']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['business: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" :formatter="showStatusFormat" />
+      <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="['business: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="['business: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: [],
+      // 显示状态选项列表
+      showStatusOptions: [],
+      // 用户性别选项列表
+      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.showStatusOptions = 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,
+        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;
+    },
+    /** 搜索按钮操作 */
+    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();
+    },
+    // 显示状态字典翻译
+    showStatusFormat(row, column) {
+      return this.selectDictLabel(this.showStatusOptions, row.showStatus);
+    },
+    // 用户性别字典翻译
+    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>
--- a/ZRAdmin.xml
+++ b/ZRAdmin.xml
@ -32,7 +32,7 @@
             代码生成演示Controller
            
             @author zr
-             @date 2021-09-27
+             @date 2021-10-10
             </summary>
        </member>
        <member name="F:ZR.Admin.WebApi.Controllers.GendemoController._GendemoService">