wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码生成demo

Browse Source
This commit is contained in:
不做码农 2021-12-01 21:29:57 +08:00
parent 95e272c450
commit f0569f43f8
8 changed files with 123 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ZR.Admin.WebApi/Controllers/business/GendemoController.cs
View File

@ -23,11 +23,11 @@ namespace ZR.Admin.WebApi.Controllers
/// 代码生成演示Controller
///
/// @author zr
/// @date 2021-11-27
/// @date 2021-12-01
/// </summary>
[Verify]
[Route("business/Gendemo")]
public class GendemoController: BaseController
public class GendemoController : BaseController
{
/// <summary>
/// 代码生成演示接口
@ -50,16 +50,15 @@ namespace ZR.Admin.WebApi.Controllers
//开始拼装查询条件
var predicate = Expressionable.Create<Gendemo>();
//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);
}
/// <summary>
/// 代码生成演示导出
/// </summary>
/// <returns></returns>
[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 });
}
}
}

8
ZR.Model/Dto/GendemoDto.cs
View File

@ -6,7 +6,7 @@ using ZR.Model.Models;
namespace ZR.Model.Dto
{
/// <summary>
/// 代码生成演示输入对象模型
/// 代码生成演示输入对象
/// </summary>
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; }
}
/// <summary>
/// 代码生成演示查询对象模型
/// 代码生成演示查询对象
/// </summary>
public class GendemoQueryDto: PagerInfo
public class GendemoQueryDto : PagerInfo
{
public int Id { get; set; }
public string Name { get; set; }

49
ZR.Model/Models/Gendemo.cs
View File

@ -8,63 +8,62 @@ namespace ZR.Model.Models
/// 代码生成演示，数据实体对象
///
/// @author zr
/// @date 2021-11-27
/// @date 2021-12-01
/// </summary>
[SqlSugar.SugarTable("gen_demo")]
[SqlSugar.Tenant("0")]
[SugarTable("gen_demo")]
[Tenant("0")]
public class Gendemo
{
/// <summary>
/// 描述 :自增id
/// 空值 :False
/// 描述 : 自增id
/// 空值 : false
/// </summary>
[SqlSugar.SugarColumn(IsPrimaryKey = false, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 描述 :名称
/// 空值 :True
/// 描述 : 名称
/// 空值 : false
/// </summary>
public string Name { get; set; }
/// <summary>
/// 描述 :图片
/// 空值 :True
/// 描述 : 图片
/// 空值 : true
/// </summary>
public string Icon { get; set; }
/// <summary>
/// 描述 :显示状态
/// 空值 :False
/// 描述 : 显示状态
/// 空值 : false
/// </summary>
public int ShowStatus { get; set; }
/// <summary>
/// 描述 :添加时间
/// 空值 :True
/// 描述 : 添加时间
/// 空值 : true
/// </summary>
public DateTime? AddTime { get; set; }
/// <summary>
/// 描述 :用户性别
/// 空值 :True
/// 描述 : 用户性别
/// 空值 : true
/// </summary>
public int? Sex { get; set; }
/// <summary>
/// 描述 :排序
/// 空值 :True
/// 描述 : 排序
/// 空值 : true
/// </summary>
public int? Sort { get; set; }
/// <summary>
/// 描述 :开始时间
/// 空值 :True
/// 描述 : 开始时间
/// 空值 : true
/// </summary>
public DateTime? BeginTime { get; set; }
/// <summary>
/// 描述 :结束时间
/// 空值 :True
/// 描述 : 结束时间
/// 空值 : true
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// 描述 :备注
/// 空值 :True
/// 描述 : 备注
/// 空值 : true
/// </summary>
public string Remark { get; set; }
}
}
}

4
ZR.Repository/Repositories/GendemoRepository.cs
View File

@ -6,10 +6,10 @@ using ZR.Model.Models;
namespace ZR.Repository
{
/// <summary>
/// 代码生成演示仓储接口的实现
/// 代码生成演示仓储
///
/// @author zr
/// @date 2021-11-27
/// @date 2021-12-01
/// </summary>
[AppService(ServiceLifetime = LifeTime.Transient)]
public class GendemoRepository : BaseRepository<Gendemo>

2
ZR.Service/Business/GendemoService.cs
View File

@ -9,7 +9,7 @@ namespace ZR.Service.Business
/// 代码生成演示Service业务层处理
///
/// @author zr
/// @date 2021-11-27
/// @date 2021-12-01
/// </summary>
[AppService(ServiceType = typeof(IGendemoService), ServiceLifetime = LifeTime.Transient)]
public class GendemoService : BaseService<Gendemo>, IGendemoService

2
ZR.Service/Business/IBusService/IGendemoService.cs
View File

@ -7,7 +7,7 @@ namespace ZR.Service.Business
/// 代码生成演示service接口
///
/// @author zr
/// @date 2021-11-27
/// @date 2021-12-01
/// </summary>
public interface IGendemoService: IBaseService<Gendemo>
{

67
ZR.Vue/src/api/business/gendemo.js Normal file
View File

@ -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
})
}

9
ZR.Vue/src/views/business/gendemo/index.vue
View File

@ -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();
},