From f0569f43f87d28a4218700d0835ab3e742b060c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 1 Dec 2021 21:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
=?UTF-8?q?=E6=88=90demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/business/GendemoController.cs | 27 ++++++--
ZR.Model/Dto/GendemoDto.cs | 8 +--
ZR.Model/Models/Gendemo.cs | 49 +++++++-------
.../Repositories/GendemoRepository.cs | 4 +-
ZR.Service/Business/GendemoService.cs | 2 +-
.../Business/IBusService/IGendemoService.cs | 2 +-
ZR.Vue/src/api/business/gendemo.js | 67 +++++++++++++++++++
ZR.Vue/src/views/business/gendemo/index.vue | 9 ++-
8 files changed, 123 insertions(+), 45 deletions(-)
create mode 100644 ZR.Vue/src/api/business/gendemo.js
diff --git a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
index 98b5993..5eafe61 100644
--- a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
+++ b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
@@ -23,11 +23,11 @@ namespace ZR.Admin.WebApi.Controllers
/// 代码生成演示Controller
///
/// @author zr
- /// @date 2021-11-27
+ /// @date 2021-12-01
///
[Verify]
[Route("business/Gendemo")]
- public class GendemoController: BaseController
+ public class GendemoController : BaseController
{
///
/// 代码生成演示接口
@@ -50,16 +50,15 @@ namespace ZR.Admin.WebApi.Controllers
//开始拼装查询条件
var predicate = Expressionable.Create();
- //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有
+ //搜索条件查询语法参考Sqlsugar
//predicate = predicate.And(m => m.Name.Contains(parm.Name));
predicate = predicate.AndIF(parm.Id > 0, m => m.Id == parm.Id);
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Name), m => m.Name.Contains(parm.Name));
- predicate = predicate.AndIF(parm.ShowStatus > 0, m => m.ShowStatus != parm.ShowStatus);
+ predicate = predicate.AndIF(parm.ShowStatus > 0, m => m.ShowStatus == parm.ShowStatus);
predicate = predicate.AndIF(parm.BeginTime != null, it => it.AddTime >= parm.BeginTime);
predicate = predicate.AndIF(parm.EndTime != null, it => it.AddTime <= parm.EndTime);
- var response = _GendemoService.GetPages(predicate.ToExpression(), parm);
-
+ var response = _GendemoService.GetPages(predicate.ToExpression(), parm, x => x.Sort, "desc");
return SUCCESS(response);
}
@@ -129,7 +128,6 @@ namespace ZR.Admin.WebApi.Controllers
Name = model.Name,
Icon = model.Icon,
ShowStatus = model.ShowStatus,
- AddTime = model.AddTime,
Sex = model.Sex,
Sort = model.Sort,
BeginTime = model.BeginTime,
@@ -156,5 +154,20 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(response);
}
+
+ ///
+ /// 代码生成演示导出
+ ///
+ ///
+ [Log(BusinessType = BusinessType.EXPORT, IsSaveResponseData = false, Title = "代码生成演示")]
+ [HttpGet("export")]
+ [ActionPermissionFilter(Permission = "business:gendemo:export")]
+ public IActionResult Export()
+ {
+ var list = _GendemoService.GetAll();
+
+ string sFileName = ExportExcel(list, "Gendemo", "代码生成演示");
+ return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
+ }
}
}
\ No newline at end of file
diff --git a/ZR.Model/Dto/GendemoDto.cs b/ZR.Model/Dto/GendemoDto.cs
index ed61fb0..bae37e4 100644
--- a/ZR.Model/Dto/GendemoDto.cs
+++ b/ZR.Model/Dto/GendemoDto.cs
@@ -6,7 +6,7 @@ using ZR.Model.Models;
namespace ZR.Model.Dto
{
///
- /// 代码生成演示输入对象模型
+ /// 代码生成演示输入对象
///
public class GendemoDto
{
@@ -14,18 +14,18 @@ namespace ZR.Model.Dto
public string Name { get; set; }
public string Icon { get; set; }
public int ShowStatus { get; set; }
+ public DateTime? AddTime { get; set; }
public int? Sex { get; set; }
public int? Sort { get; set; }
public DateTime? BeginTime { get; set; }
public DateTime? EndTime { get; set; }
public string Remark { get; set; }
-
}
///
- /// 代码生成演示查询对象模型
+ /// 代码生成演示查询对象
///
- public class GendemoQueryDto: PagerInfo
+ public class GendemoQueryDto : PagerInfo
{
public int Id { get; set; }
public string Name { get; set; }
diff --git a/ZR.Model/Models/Gendemo.cs b/ZR.Model/Models/Gendemo.cs
index 27c558b..a517176 100644
--- a/ZR.Model/Models/Gendemo.cs
+++ b/ZR.Model/Models/Gendemo.cs
@@ -8,63 +8,62 @@ namespace ZR.Model.Models
/// 代码生成演示，数据实体对象
///
/// @author zr
- /// @date 2021-11-27
+ /// @date 2021-12-01
///
- [SqlSugar.SugarTable("gen_demo")]
- [SqlSugar.Tenant("0")]
+ [SugarTable("gen_demo")]
+ [Tenant("0")]
public class Gendemo
{
///
- /// 描述 :自增id
- /// 空值 :False
+ /// 描述 : 自增id
+ /// 空值 : false
///
[SqlSugar.SugarColumn(IsPrimaryKey = false, IsIdentity = true)]
public int Id { get; set; }
///
- /// 描述 :名称
- /// 空值 :True
+ /// 描述 : 名称
+ /// 空值 : false
///
public string Name { get; set; }
///
- /// 描述 :图片
- /// 空值 :True
+ /// 描述 : 图片
+ /// 空值 : true
///
public string Icon { get; set; }
///
- /// 描述 :显示状态
- /// 空值 :False
+ /// 描述 : 显示状态
+ /// 空值 : false
///
public int ShowStatus { get; set; }
///
- /// 描述 :添加时间
- /// 空值 :True
+ /// 描述 : 添加时间
+ /// 空值 : true
///
public DateTime? AddTime { get; set; }
///
- /// 描述 :用户性别
- /// 空值 :True
+ /// 描述 : 用户性别
+ /// 空值 : true
///
public int? Sex { get; set; }
///
- /// 描述 :排序
- /// 空值 :True
+ /// 描述 : 排序
+ /// 空值 : true
///
public int? Sort { get; set; }
///
- /// 描述 :开始时间
- /// 空值 :True
+ /// 描述 : 开始时间
+ /// 空值 : true
///
public DateTime? BeginTime { get; set; }
///
- /// 描述 :结束时间
- /// 空值 :True
+ /// 描述 : 结束时间
+ /// 空值 : true
///
public DateTime? EndTime { get; set; }
///
- /// 描述 :备注
- /// 空值 :True
+ /// 描述 : 备注
+ /// 空值 : true
///
public string Remark { get; set; }
-
}
-}
+}
\ No newline at end of file
diff --git a/ZR.Repository/Repositories/GendemoRepository.cs b/ZR.Repository/Repositories/GendemoRepository.cs
index ec4f341..8e969a1 100644
--- a/ZR.Repository/Repositories/GendemoRepository.cs
+++ b/ZR.Repository/Repositories/GendemoRepository.cs
@@ -6,10 +6,10 @@ using ZR.Model.Models;
namespace ZR.Repository
{
///
- /// 代码生成演示仓储接口的实现
+ /// 代码生成演示仓储
///
/// @author zr
- /// @date 2021-11-27
+ /// @date 2021-12-01
///
[AppService(ServiceLifetime = LifeTime.Transient)]
public class GendemoRepository : BaseRepository
diff --git a/ZR.Service/Business/GendemoService.cs b/ZR.Service/Business/GendemoService.cs
index eebec8a..e5a2001 100644
--- a/ZR.Service/Business/GendemoService.cs
+++ b/ZR.Service/Business/GendemoService.cs
@@ -9,7 +9,7 @@ namespace ZR.Service.Business
/// 代码生成演示Service业务层处理
///
/// @author zr
- /// @date 2021-11-27
+ /// @date 2021-12-01
///
[AppService(ServiceType = typeof(IGendemoService), ServiceLifetime = LifeTime.Transient)]
public class GendemoService : BaseService, IGendemoService
diff --git a/ZR.Service/Business/IBusService/IGendemoService.cs b/ZR.Service/Business/IBusService/IGendemoService.cs
index 7e3ec35..4632e5d 100644
--- a/ZR.Service/Business/IBusService/IGendemoService.cs
+++ b/ZR.Service/Business/IBusService/IGendemoService.cs
@@ -7,7 +7,7 @@ namespace ZR.Service.Business
/// 代码生成演示service接口
///
/// @author zr
- /// @date 2021-11-27
+ /// @date 2021-12-01
///
public interface IGendemoService: IBaseService
{
diff --git a/ZR.Vue/src/api/business/gendemo.js b/ZR.Vue/src/api/business/gendemo.js
new file mode 100644
index 0000000..cd10b98
--- /dev/null
+++ b/ZR.Vue/src/api/business/gendemo.js
@@ -0,0 +1,67 @@
+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}
+*/
+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'
+ })
+}
+// 导出代码生成演示
+export function exportGendemo(query) {
+ return request({
+ url: 'business/Gendemo/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/ZR.Vue/src/views/business/gendemo/index.vue b/ZR.Vue/src/views/business/gendemo/index.vue
index 614f3ea..74051bc 100644
--- a/ZR.Vue/src/views/business/gendemo/index.vue
+++ b/ZR.Vue/src/views/business/gendemo/index.vue
@@ -143,13 +143,11 @@ import {
delGendemo,
updateGendemo,
getGendemo,
-} from "@/api/gendemo.js";
-
-import Editor from "@/components/Editor";
+} from "@/api/business/gendemo.js";
export default {
name: "Gendemo",
- components: { Editor },
+ components: {},
data() {
return {
labelWidth: "100px",
@@ -190,6 +188,7 @@ export default {
// 表单校验
rules: {
id: [{ type: "number", message: "id必须为数字值", trigger: "blur" }],
+ name: [{ required: true, message: "请输入名称", trigger: "blur" }],
showStatus: [
{ required: true, message: "请输入显示状态", trigger: "blur" },
],
@@ -291,7 +290,7 @@ export default {
},
//文件上传成功方法
handleUploadIconSuccess(res, file) {
- this.form.icon = res.data;
+ this.form.icon = res.data;
// this.form.icon = URL.createObjectURL(file.raw);
// this.$refs.upload.clearFiles();
},