设备数采项目刷选 工艺标准模板导出

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs

@@ -0,0 +1,16 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class EquipDaqQueryOutput
+    {
+        public string id { get; set; }
+        public string data_source { get; set; }
+        public string create_id { get; set; }
+        public string create_time { get; set; }
+        public string data_type { get; set; }
+        public string enabled { get; set; }
+        public string equip_id { get; set; }
+        public string label_name { get; set; }
+        public string label_point { get; set; }
+        public string remark { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpDaq.cs

@@ -0,0 +1,87 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 数据采集项目
+/// </summary>
+[SugarTable("eqp_daq")]
+public partial class EqpDaq : BaseEntity<string>
+{
+    public EqpDaq()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 数据源
+    /// </summary>
+    public string data_source { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 标签名称
+    /// </summary>
+    public string? label_name { get; set; }
+
+    /// <summary>
+    /// 标签点位
+    /// </summary>
+    public string? label_point { get; set; }
+
+    /// <summary>
+    /// 数据类型
+    /// </summary>
+    public string? data_type { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public int? enabled { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 设备id
+    /// </summary>
+    public string equip_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+}

EquipMgr/Tnb.EquipMgr.Interfaces/IEqpDaqService.cs

@@ -0,0 +1,12 @@
+using Tnb.EquipMgr.Entities.Dto;
+namespace Tnb.EquipMgr.Interfaces
+{
+    public interface IEqpDaqService
+    {
+        /// <summary>
+        /// 根据设备id获取数采项目
+        /// </summary>
+        /// <returns></returns>
+        public Task<dynamic> GetEquipDaqList(EquipQueryInput input);
+    }
+}

EquipMgr/Tnb.EquipMgr/EqpDaqService.cs

@@ -0,0 +1,63 @@
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Filter;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.Systems.Entitys.Permission;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using SqlSugar;
+using Tnb.EquipMgr.Entities;
+using Tnb.EquipMgr.Entities.Dto;
+using Tnb.EquipMgr.Interfaces;
+
+namespace Tnb.EquipMgr
+{
+    /// <summary>
+    /// 设备数采项目
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+    public class EqpDaqService : IEqpDaqService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<EqpDaq> _repository;
+        private readonly IUserManager _userManager;
+
+        public EqpDaqService(ISqlSugarRepository<EqpDaq> repository, IUserManager userManager)
+        {
+            _userManager = userManager;
+            _repository = repository;
+        }
+
+        [HttpPost]
+        public async Task<dynamic> GetEquipDaqList(EquipQueryInput input)
+        {
+            var db = _repository.AsSugarClient();
+            Dictionary<string, string> queryJson = new Dictionary<string, string>();
+            if (!string.IsNullOrEmpty(input.queryJson))
+            {
+                queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
+            }
+            var result = await db.Queryable<EqpDaq>()
+                .LeftJoin<UserEntity>((a,b)=>a.create_id==b.Id)
+                .Where(a=>a.equip_id==input.equip_id)
+                .WhereIF(queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"])
+                .WhereIF(queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"]))
+                .WhereIF(queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"]))
+                .Select((a,b) => new EquipDaqQueryOutput
+                {
+                    id = a.id,
+                    data_source = a.data_source,
+                    create_id = b.RealName,
+                    create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
+                    data_type = a.data_type,
+                    enabled = a.enabled==1 ? "是" : "否",
+                    equip_id = a.equip_id,
+                    label_name = a.label_name,
+                    label_point = a.label_point,
+                    remark = a.remark
+                }).ToPagedListAsync(input.currentPage, input.pageSize);
+
+            return PageResult<EquipDaqQueryOutput>.SqlSugarPageResult(result);
+        }
+    }
+}

EquipMgr/Tnb.EquipMgr/EqpEquipScrapService.cs

@@ -1,6 +1,7 @@
 using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
 using JNPF.Common.Enums;
+using JNPF.Common.Security;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
@@ -41,6 +42,7 @@ namespace Tnb.EquipMgr
             var db = _repository.AsSugarClient();
             DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
             {
+                eqpEquipScrap.id = SnowflakeIdHelper.NextId();
                 eqpEquipScrap.create_id = _userManager.UserId;
                 eqpEquipScrap.create_time = DateTime.Now;
 

EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs

@@ -11,7 +11,8 @@ using Tnb.EquipMgr.Interfaces;
 
 namespace Tnb.EquipMgr
 {
-    /// 设备备品备件
+    /// <summary>
+    /// 设备技术参数
     /// </summary>
     [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
     [Route("api/[area]/[controller]/[action]")]