diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/1.txt b/ZR.Admin.WebApi/Controllers/MES/dev/1.txt deleted file mode 100644 index e69de29..0000000 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs b/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs new file mode 100644 index 0000000..1683410 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs @@ -0,0 +1,107 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Admin.WebApi.Filters; +using ZR.Model.MES.dv.Dto; +using ZR.Model.MES.dv; + +////创建时间:2024-05-20 +//namespace ZR.Admin.WebApi.Controllers +//{ +// /// +// /// 1.设备类型 +// /// + +// [Route("business/DeviceType")] +// public class DeviceTypeController : BaseController +// { +// /// +// /// 1.设备类型接口 +// /// +// private readonly IDeviceTypeService _DeviceTypeService; + +// public DeviceTypeController(IDeviceTypeService DeviceTypeService) +// { +// _DeviceTypeService = DeviceTypeService; +// } + +// /// +// /// 查询1.设备类型列表 +// /// +// /// +// /// +// [HttpGet("list")] +// [ActionPermissionFilter(Permission = "business:devicetype:list")] +// public IActionResult QueryDeviceType([FromQuery] DeviceTypeQueryDto parm) +// { +// var response = _DeviceTypeService.GetList(parm); +// return SUCCESS(response); +// } + + +// /// +// /// 查询1.设备类型详情 +// /// +// /// +// /// +// [HttpGet("{Id}")] +// [ActionPermissionFilter(Permission = "business:devicetype:query")] +// public IActionResult GetDeviceType(int Id) +// { +// var response = _DeviceTypeService.GetInfo(Id); + +// var info = response.Adapt(); +// return SUCCESS(info); +// } + +// /// +// /// 添加1.设备类型 +// /// +// /// +// [HttpPost] +// [ActionPermissionFilter(Permission = "business:devicetype:add")] +// [Log(Title = "1.设备类型", BusinessType = BusinessType.INSERT)] +// public IActionResult AddDeviceType([FromBody] DeviceTypeDto parm) +// { +// var modal = parm.Adapt().ToCreate(HttpContext); + +// var response = _DeviceTypeService.AddDeviceType(modal); + +// return SUCCESS(response); +// } + +// /// +// /// 更新1.设备类型 +// /// +// /// +// [HttpPut] +// [ActionPermissionFilter(Permission = "business:devicetype:edit")] +// [Log(Title = "1.设备类型", BusinessType = BusinessType.UPDATE)] +// public IActionResult UpdateDeviceType([FromBody] DeviceTypeDto parm) +// { +// var modal = parm.Adapt().ToUpdate(HttpContext); +// var response = _DeviceTypeService.UpdateDeviceType(modal); + +// return ToResponse(response); +// } + +// /// +// /// 删除1.设备类型 +// /// +// /// +// [HttpDelete("{ids}")] +// [ActionPermissionFilter(Permission = "business:devicetype:delete")] +// [Log(Title = "1.设备类型", BusinessType = BusinessType.DELETE)] +// public IActionResult DeleteDeviceType(string ids) +// { +// int[] idsArr = Tools.SpitIntArrary(ids); +// if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + +// var response = _DeviceTypeService.Delete(idsArr); + +// return ToResponse(response); +// } + + + + +// } +//} \ No newline at end of file diff --git a/ZR.Admin.WebApi/DOAN.WebApi.csproj b/ZR.Admin.WebApi/DOAN.WebApi.csproj index 5eaf5da..db2f23c 100644 --- a/ZR.Admin.WebApi/DOAN.WebApi.csproj +++ b/ZR.Admin.WebApi/DOAN.WebApi.csproj @@ -30,9 +30,6 @@ - - TextTemplatingFileGenerator - Always diff --git a/ZR.Admin.WebApi/appsettings.Development.json b/ZR.Admin.WebApi/appsettings.Development.json index 1cf614b..6df804e 100644 --- a/ZR.Admin.WebApi/appsettings.Development.json +++ b/ZR.Admin.WebApi/appsettings.Development.json @@ -35,7 +35,7 @@ }, "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks", "ZR.ServiceCore" ], //自动注入类 "ShowDbLog": true, //是否打印db日志 - "InitDb": true, //是否初始化db + "InitDb": false, //是否初始化db "DemoMode": false, //是否演示模式 "SingleLogin": false, //是否单点登录 "Upload": { diff --git a/ZR.Model/MES/dv/DeviceType.cs b/ZR.Model/MES/dv/DeviceType.cs new file mode 100644 index 0000000..be2e8d5 --- /dev/null +++ b/ZR.Model/MES/dv/DeviceType.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Model.MES.dv +{ + /// + /// 1.设备类型 + /// + [SugarTable("device_type")] + public class DeviceType + { + /// + /// id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 父id + /// + [SugarColumn(ColumnName = "parent_id")] + public int ParentId { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 是否启用 + /// + public int? Status { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/dv/Dto/DeviceTypeDto.cs b/ZR.Model/MES/dv/Dto/DeviceTypeDto.cs new file mode 100644 index 0000000..d79122c --- /dev/null +++ b/ZR.Model/MES/dv/Dto/DeviceTypeDto.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Model.MES.dv.Dto +{ + /// + /// 1.设备类型查询对象 + /// + public class DeviceTypeQueryDto : PagerInfo + { + } + + /// + /// 1.设备类型输入输出对象 + /// + public class DeviceTypeDto + { + [Required(ErrorMessage = "id不能为空")] + public int Id { get; set; } + + [Required(ErrorMessage = "父id不能为空")] + public int ParentId { get; set; } + + public string Name { get; set; } + + public int? Status { get; set; } + + public string Remark { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + + + + } +} +