优化代码生成功能、新增加打包zip文件

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

@@ -0,0 +1,134 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using SqlSugar;
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using {ModelsNamespace}.Dto;
+using {ModelsNamespace}.Models;
+using {ServicesNamespace}.Business;
+using {ApiControllerNamespace}.Extensions;
+using {ApiControllerNamespace}.Filters;
+using ZR.Common;
+
+namespace {ApiControllerNamespace}.Controllers
+{
+    /// <summary>
+    /// 代码自动生成
+    /// </summary>
+    [Verify]
+    [Route("bus/{ModelName}")]
+    public class {ModelName}Controller: BaseController
+	{
+        /// <summary>
+        /// {TableDesc}接口
+        /// </summary>
+        private readonly I{ModelName}Service _{ModelName}Service;
+
+        public {ModelName}Controller(I{ModelName}Service {ModelName}Service)
+        {
+            _{ModelName}Service = {ModelName}Service;
+        }
+
+        /// <summary>
+        /// 查询{TableDesc}列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "{Permission}:list")]
+        public IActionResult Query{ModelName}([FromQuery] {ModelName}QueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<{ModelName}>();
+
+            //TODO 搜索条件
+            //predicate = predicate.And(m => m.Name.Contains(parm.Name));
+
+            var response = _{ModelName}Service.GetPages(predicate.ToExpression(), parm);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询{TableDesc}详情
+        /// </summary>
+        /// <param name="{PrimaryKey}"></param>
+        /// <returns></returns>
+        [HttpGet("{{PrimaryKey}}")]
+        [ActionPermissionFilter(Permission = "{Permission}:query")]
+        public IActionResult Get{ModelName}({PKCsharpType} {PrimaryKey})
+        {
+            var response = _{ModelName}Service.GetId({PrimaryKey});
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 添加{TableDesc}
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "{Permission}:add")]
+        [Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
+        public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求参数错误");
+            }
+            //从 Dto 映射到 实体
+            var model = parm.Adapt<{ModelName}>().ToCreate();
+
+            return SUCCESS(_{ModelName}Service.Add(model, it => new
+            {
+                {InsertColumn}
+            }));
+        }
+
+        /// <summary>
+        /// 更新{TableDesc}
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "{Permission}:update")]
+        [Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
+        public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求实体不能为空");
+            }
+            //从 Dto 映射到 实体
+            var model = parm.Adapt<{ModelName}>().ToUpdate();
+
+            var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
+            {
+                //Update 字段映射
+                {UpdateColumn}
+            });
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 删除{TableDesc}
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "{Permission}:delete")]
+        [Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
+        public IActionResult Delete{ModelName}(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _{ModelName}Service.Delete(idsArr);
+
+            return SUCCESS(response);
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+using System;
+using {ModelsNamespace}.Models;
+
+namespace {IServicsNamespace}.Business
+{
+    /// <summary>
+    /// 定义{TableNameDesc}服务接口
+    /// </summary>
+    public interface I{ModelTypeName}Service: IBaseService<{ModelTypeName}>
+    {
+    }
+}

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

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using {ModelsNamespace}.Dto;
+using {ModelsNamespace}.Models;
+
+namespace {DtosNamespace}.Dto
+{
+    /// <summary>
+    /// {TableNameDesc}输入对象模型
+    /// </summary>
+    public class {ModelTypeName}Dto
+    {
+{PropertyName}
+    }
+
+    /// <summary>
+    /// {TableNameDesc}查询对象模型
+    /// </summary>
+    public class {ModelTypeName}QueryDto: PagerInfo 
+    {
+{QueryProperty}
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
+    }
+}

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

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace {ModelsNamespace}.Models
+{
+    /// <summary>
+    /// {TableNameDesc}，数据实体对象
+    /// </summary>
+    [SqlSugar.SugarTable("{TableName}")]
+    public class {ModelTypeName}
+    {
+{PropertyName}
+    }
+}

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

@@ -0,0 +1,25 @@
+using System;
+using Infrastructure.Attribute;
+using {RepositoriesNamespace}.System;
+using {ModelsNamespace}.Models;
+
+namespace {RepositoriesNamespace}
+{
+    /// <summary>
+    /// 代码生成器生成
+    /// {TableNameDesc}仓储接口的实现
+    /// </summary>
+    [AppService(ServiceLifetime = LifeTime.Transient)]
+    public class {ModelTypeName}Repository : BaseRepository
+    {
+		public {ModelTypeName}Repository()
+        {
+        }
+
+        #region 业务逻辑代码
+
+        
+
+        #endregion
+    }
+}

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

@@ -0,0 +1,31 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ZR.Common;
+using {ModelsNamespace}.Models;
+using {IRepositoriesNamespace};
+
+namespace {ServicesNamespace}.Business
+{
+    /// <summary>
+    /// 代码生成器生成
+    /// </summary>
+    [AppService(ServiceType = typeof(I{ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)]
+    public class {ModelTypeName}Service: BaseService<{ModelTypeName}>, I{ModelTypeName}Service
+    {
+		private readonly {ModelTypeName}Repository _repository;
+        public {ModelTypeName}Service({ModelTypeName}Repository repository)
+        {
+			_repository = repository;
+        }
+
+        #region 业务逻辑代码
+
+        #endregion
+    }
+}

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

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

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

@@ -0,0 +1,219 @@
+<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>
+      {vueQueryFormHtml}
+
+      <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="['{Permission}: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="['{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-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" />
+      {VueViewListContent}
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button size="mini"  v-hasPermi="['{Permission}: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="['{Permission}:delete']" size="mini" type="text" icon="el-icon-delete">删除</el-button>
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination class="mt10" background :total="total" :current-page.sync="queryParams.pageNum" :page-size="queryParams.pageSize" :page-sizes="[20, 30, 50, 100]" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="getList" />
+
+    <!-- 添加或修改菜单对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
+      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
+        {VueViewFormContent}
+      </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 { 
+    list{ModelTypeName},
+    add{ModelTypeName},
+    del{ModelTypeName},
+    update{ModelTypeName},
+    get{ModelTypeName} 
+} from '@/api/{fileClassName}.js'
+
+export default {
+  name: '{ModelTypeName}',
+  data() {
+    return {
+      labelWidth: "100px",
+      formLabelWidth:"100px",
+	  // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {},
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      // 时间范围数组
+      timeRange: [],
+      {VueDataContent}
+      // 数据列表
+      dataList: [],
+      // 总记录数
+      total: 0,
+      // 提交按钮是否显示
+      btnSubmitVisible: true,
+      // 表单校验
+      rules: {
+        {VueViewEditFormRuleContent}
+      },
+    };
+  },
+  mounted() {
+    // 列表数据查询
+    this.getList();
+    // 下拉框绑定
+    // this.getDicts("sys_normal_disable").then((response) => {
+    //   this.statusOptions = response.data;
+    // });
+    {MountedMethod}
+  },
+  methods: {
+    // 查询数据
+    getList() {
+      console.log(JSON.stringify(this.queryParams));
+       list{ModelTypeName}(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 = {
+        {VueViewEditFormContent}
+		//需个性化处理内容
+      };
+      this.resetForm("form");
+    },
+    /** 重置查询操作 */
+    resetQuery() {
+      this.timeRange = [];
+      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 20,
+        //TODO 重置字段
+      };
+    },
+	 // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.{primaryKey});
+      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 {primaryKey}s = row.{primaryKey} || this.ids;
+      del{ModelTypeName}({primaryKey}s.toString()).then((res) => {
+        this.msgSuccess("删除成功");
+        this.handleQuery();
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const {primaryKey} = row.{primaryKey} || this.ids;
+      get{ModelTypeName}({primaryKey}).then((res) => {
+        if(res.code == 200){
+            this.form = res.data;
+            this.open = true;
+            this.title = "修改数据";
+        }
+      });
+    },
+    beforeFileUpload(file) { },
+    {vueJsMethod}
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          console.log(JSON.stringify(this.form));
+          
+          if (this.form.{primaryKey} != undefined || this.title === '修改数据') {
+            update{ModelTypeName}(this.form).then((res) => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+            });
+          } else {
+            add{ModelTypeName}(this.form).then((res) => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+            });
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+.table-td-thumb {
+  width: 80px;
+}
+</style>