wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DEVICE8\12494
2023-06-02 08:39:53 +08:00
parent 73445f813e 45b05925d7
commit aed23fac08
54 changed files with 1235 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs
View File

@@ -11,6 +11,10 @@ public static class DictConst
/// 区域类型-工位Code
/// </summary>
public const string RegionCategoryStationCode = "workstation";
/// <summary>
/// 备品备件类型
/// </summary>
public const string SparePartsType = "SparePartsType";
#endregion

12
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -90,8 +90,8 @@ namespace Tnb.BasicData
BasEbomH ebom = await db.Queryable<BasEbomH>().Where(x => x.id == queryInput.ebom_id).SingleAsync();
ids.Add(ebom.material_id);
var result = await db.Queryable<BasMaterial>()
.LeftJoin<DictionaryDataEntity>((a, b) => a.unit_id == b.EnCode)
.LeftJoin<DictionaryTypeEntity>((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null)
.LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode)
.WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info))
.WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id))
.Select((a, b, c) => new MaterialSelectOutput()
@@ -101,7 +101,7 @@ namespace Tnb.BasicData
name = a.name,
descrip = a.descrip,
unit_id = a.unit_id,
unit_name = b.FullName,
unit_name = c.FullName,
}).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize);
return PageResult<MaterialSelectOutput>.SqlSugarPageResult(result);
@@ -110,8 +110,8 @@ namespace Tnb.BasicData
else
{
var result = await db.Queryable<BasMaterial>()
.LeftJoin<DictionaryDataEntity>((a, b) => a.unit_id == b.EnCode)
.LeftJoin<DictionaryTypeEntity>((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null)
.LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode)
.WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info))
.Select((a, b, c) => new MaterialSelectOutput()
{
@@ -120,7 +120,7 @@ namespace Tnb.BasicData
name = a.name,
descrip = a.descrip,
unit_id = a.unit_id,
unit_name = b.FullName,
unit_name = c.FullName,
}).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize);
return PageResult<MaterialSelectOutput>.SqlSugarPageResult(result);

14
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs Normal file
View File

@@ -0,0 +1,14 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipFileQueryOutput
{
public string id { get; set; }
public string attachment { get; set; }
public string create_id { get; set; }
public string create_id_id { get; set; }
public string create_time { get; set; }
public string equip_id { get; set; }
public string equip_id_id { get; set; }
public string file_name { get; set; }
}
}

21
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs Normal file
View File

@@ -0,0 +1,21 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipMaintainRecordQueryOutput
{
public string id { get; set; }
public string attachment { get; set; }
public string create_time { get; set; }
public string equip_id { get; set; }
public string equip_id_id { get; set; }
public string execute_time { get; set; }
public string execute_user_id { get; set; }
public string repeat_remark { get; set; }
public string repeat_result { get; set; }
public string repeat_time { get; set; }
public string repeat_user_id { get; set; }
public string result { get; set; }
public string result_remark { get; set; }
public string maintain_tem_equip_id { get; set; }
public string status { get; set; }
}
}

19
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs Normal file
View File

@@ -0,0 +1,19 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipQueryInput
{
public string equip_id { get; set; }
/// <summary>
/// 当前页码:pageIndex.
/// </summary>
public virtual int currentPage { get; set; } = 1;
/// <summary>
/// 每页行数.
/// </summary>
public virtual int pageSize { get; set; } = 50;
public string queryJson { get; set; }
}
}

16
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs Normal file
View File

@@ -0,0 +1,16 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipRepairRecordQueryOutput
{
public string id { get; set; }
public string code { get; set; }
public string name { get; set; }
public string equip_id { get; set; }
public string apply_user_id { get; set; }
public string is_ugent { get; set; }
public string description { get; set; }
public string complete_time { get; set; }
public string repairer_id { get; set; }
public string repair_description { get; set; }
}
}

9
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipSparePartsInput
{
public string equip_id { get; set; }
public List<string> spare_parts_ids { get; set; }
}
}

13
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipSparePartsQueryOutput
{
public string id { get; set; }
public string type_code { get; set; }
public string type_name { get; set; }
public string code { get; set; }
public string name { get; set; }
public string specification { get; set; }
}
}

20
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs Normal file
View File

@@ -0,0 +1,20 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipSpotInsRecordQueryOutput
{
public string id { get; set; }
public string attachment { get; set; }
public string create_time { get; set; }
public string equip_id { get; set; }
public string repeat_remark { get; set; }
public string repeat_result { get; set; }
public string repeat_time { get; set; }
public string repeat_user_id { get; set; }
public string result { get; set; }
public string result_remark { get; set; }
public string spot_ins_tem_equip_id { get; set; }
public string spot_record_date_time { get; set; }
public string spot_record_user_id { get; set; }
public string status { get; set; }
}
}

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipTechnologyParameterQueryOutput
{
public string id { get; set; }
public string name { get; set; }
public string definition { get; set; }
public string remark { get; set; }
}
}

18
EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs Normal file
View File

@@ -0,0 +1,18 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class SubEquipQueryOutput
{
public string code { get; set; }
public string create_id { get; set; }
public string create_id_id { get; set; }
public string create_time { get; set; }
public string equip_id { get; set; }
public string equip_id_id { get; set; }
public string id { get; set; }
public string modify_id { get; set; }
public string modify_time { get; set; }
public string name { get; set; }
public string org_id { get; set; }
public string specification { get; set; }
}
}

52
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs Normal file
View File

@@ -0,0 +1,52 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 设备备品备件关联表
/// </summary>
[SugarTable("eqp_equip_spare_parts")]
public partial class EqpEquipSpareParts : BaseEntity<string>
{
public EqpEquipSpareParts()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 设备id
/// </summary>
public string equip_id { get; set; } = string.Empty;
/// <summary>
/// 备品备件id
/// </summary>
public string spare_parts_id { get; set; } = string.Empty;
/// <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; }
}

127
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpEquipCheckRecord.cs Normal file
View File

@@ -0,0 +1,127 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 特种设备检验登记记录表
/// </summary>
[SugarTable("eqp_sp_equip_check_record")]
public partial class EqpSpEquipCheckRecord : BaseEntity<string>
{
public EqpSpEquipCheckRecord()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 设备id
/// </summary>
public string? equip_id { get; set; }
/// <summary>
/// 证书编号
/// </summary>
public string? license_code { get; set; }
/// <summary>
/// 经办人id
/// </summary>
public string? oper_user_id { get; set; }
/// <summary>
/// 送检时间
/// </summary>
public DateTime? send_time { get; set; }
/// <summary>
/// 领证时间
/// </summary>
public DateTime? get_time { get; set; }
/// <summary>
/// 检验结果
/// </summary>
public int? check_result { get; set; }
/// <summary>
/// 提前预警时间
/// </summary>
public int? warm_time { get; set; }
/// <summary>
/// 提前预警时间单位
/// </summary>
public string? warn_unit { get; set; }
/// <summary>
/// 有效开始时间
/// </summary>
public DateTime? start_time { get; set; }
/// <summary>
/// 有效结束时间
/// </summary>
public DateTime? end_time { get; set; }
/// <summary>
/// 下次检验时间
/// </summary>
public DateTime? next_check_time { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
/// <summary>
/// 状态 0 待检验 1 已检验
/// </summary>
public string status { get; set; }
/// <summary>
/// 证书名称
/// </summary>
public string? license_name { get; set; }
/// <summary>
/// 证书附件
/// </summary>
public string? attachment { get; set; }
/// <summary>
/// 流程任务Id
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
}

67
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpareParts.cs Normal file
View File

@@ -0,0 +1,67 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 备品备件
/// </summary>
[SugarTable("eqp_spare_parts")]
public partial class EqpSpareParts : BaseEntity<string>
{
public EqpSpareParts()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 类型id
/// </summary>
public string type_id { get; set; } = string.Empty;
/// <summary>
/// 编码
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 名称
/// </summary>
public string name { get; set; } = string.Empty;
/// <summary>
/// 规格型号
/// </summary>
public string? specification { 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>
/// 备注
/// </summary>
public string? remark { get; set; }
}

62
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSubEquip.cs Normal file
View File

@@ -0,0 +1,62 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 设备子设备关联表
/// </summary>
[SugarTable("eqp_sub_equip")]
public partial class EqpSubEquip : BaseEntity<string>
{
public EqpSubEquip()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 编码
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 名称
/// </summary>
public string name { get; set; } = string.Empty;
/// <summary>
/// 规格型号
/// </summary>
public string? specification { 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;
}

62
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpTechnologyParameter.cs Normal file
View File

@@ -0,0 +1,62 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 设备技术参数
/// </summary>
[SugarTable("eqp_technology_parameter")]
public partial class EqpTechnologyParameter : BaseEntity<string>
{
public EqpTechnologyParameter()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 名称
/// </summary>
public string name { get; set; } = string.Empty;
/// <summary>
/// 定义
/// </summary>
public string definition { get; set; } = string.Empty;
/// <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;
}

6
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipFileService.cs
View File

@@ -11,5 +11,11 @@ namespace Tnb.EquipMgr.Interfaces
///// <param name="file"></param>
///// <returns></returns>
//public Task<string> Upload(string equip_id,IFormFile file);
/// <summary>
/// 根据设备id获取设备附件
/// </summary>
/// <returns></returns>
public Task<dynamic> GetEquipFileList(EquipQueryInput input);
}
}

20
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipSparePartsService.cs Normal file
View File

@@ -0,0 +1,20 @@
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpEquipSparePartsService
{
/// <summary>
/// 新增备品备件
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public Task AddEquipSpareParts(EquipSparePartsInput input);
/// <summary>
/// 根据设备id获取备品备件
/// </summary>
/// <returns></returns>
public Task<dynamic> GetEquipSparePartsList(EquipQueryInput input);
}
}

6
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainRecordService.cs
View File

@@ -25,6 +25,12 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="pageInput"></param>
/// <returns></returns>
public Task<string> RepeatMaintain(MaintainRecordRepeatInput input);
/// <summary>
/// 根据设备id获取设备保养记录
/// </summary>
/// <returns></returns>
public Task<dynamic> GetMaintainRecordList(EquipQueryInput input);
}
}

6
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
View File

@@ -53,5 +53,11 @@ namespace Tnb.EquipMgr.Interfaces
/// </summary>
/// <param name="dic"></param>
public Task<RepairApplyDetailOutput> GetRepairApplyDetail(Dictionary<string, string> dic);
/// <summary>
/// 根据设备id获取维修记录
/// </summary>
/// <returns></returns>
public Task<dynamic> GetRepairRecordList(EquipQueryInput input);
}
}

9
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSpEquipCheckRecordService.cs Normal file
View File

@@ -0,0 +1,9 @@
using Tnb.EquipMgr.Entities;
namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpSpEquipCheckRecordService
{
public Task Register(EqpSpEquipCheckRecord entity);
}
}

13
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSubEquipService.cs Normal file
View File

@@ -0,0 +1,13 @@
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpSubEquipService
{
/// <summary>
/// 根据设备id获取子设备
/// </summary>
/// <returns></returns>
public Task<dynamic> GetSubEquipList(EquipQueryInput input);
}
}

12
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpTechnologyParameterService.cs Normal file
View File

@@ -0,0 +1,12 @@
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpTechnologyParameterService
{
/// <summary>
/// 根据设备id获取技术参数
/// </summary>
/// <returns></returns>
public Task<dynamic> GetEquipTechnologyParameterList(EquipQueryInput input);
}
}

6
EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs
View File

@@ -25,6 +25,12 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="pageInput"></param>
/// <returns></returns>
public Task RepeatSpotIns(SpotInsRecordRepeatInput input);
/// <summary>
/// 根据设备id获取点巡检记录
/// </summary>
/// <returns></returns>
public Task<dynamic> GetSpotInsRecordList(EquipQueryInput input);
}
}

35
EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs
View File

@@ -1,12 +1,14 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
using JNPF.Common.Models;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Common;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Interfaces.Common;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
@@ -56,7 +58,8 @@ namespace Tnb.EquipMgr
equip_id = equip_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
attachment = JsonConvert.SerializeObject(attachment)
attachment = JsonConvert.SerializeObject(attachment),
org_id = _userManager.GetUserInfo().Result.organizeId,
};
await _repository.InsertAsync(eqpEquipFile);
@@ -71,5 +74,35 @@ namespace Tnb.EquipMgr
return msg;
}
[HttpPost]
public async Task<dynamic> GetEquipFileList(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<EqpEquipFile>()
.LeftJoin<UserEntity >((a, b) => a.create_id == b.Id)
.LeftJoin<UserEntity >((a, b,c) => a.modify_id == c.Id)
.LeftJoin<EqpEquipment >((a, b,c,d) => a.equip_id == d.id)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson["file_name"]))
.Select((a, b, c,d) => new EquipFileQueryOutput
{
id = a.id,
attachment = a.attachment,
create_id = b.RealName,
create_id_id = a.create_id,
create_time = a.create_time.Value.ToString("yyyy-MM-dd"),
equip_id=d.name,
equip_id_id= a.equip_id,
file_name=a.file_name,
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EquipFileQueryOutput>.SqlSugarPageResult(result);
}
}
}

85
EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs Normal file
View File

@@ -0,0 +1,85 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
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>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
public class EqpEquipSparePartsService : IEqpEquipSparePartsService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<EqpEquipSpareParts> _repository;
private readonly IUserManager _userManager;
public EqpEquipSparePartsService(ISqlSugarRepository<EqpEquipSpareParts> repository, IUserManager userManager)
{
_userManager = userManager;
_repository = repository;
}
[HttpPost]
public async Task AddEquipSpareParts(EquipSparePartsInput input)
{
List<EqpEquipSpareParts> oldList = await _repository.GetListAsync(x => x.equip_id == input.equip_id);
List<EqpEquipSpareParts> list = new List<EqpEquipSpareParts>();
string orgId = _userManager.GetUserInfo().Result.organizeId;
foreach (var spare_parts_id in input.spare_parts_ids)
{
if (oldList.Any(x => x.spare_parts_id == spare_parts_id))
continue;
list.Add(new EqpEquipSpareParts()
{
id = SnowflakeIdHelper.NextId(),
equip_id = input.equip_id,
spare_parts_id = spare_parts_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
org_id = orgId,
});
}
await _repository.InsertRangeAsync(list);
}
[HttpPost]
public async Task<dynamic> GetEquipSparePartsList(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<EqpEquipSpareParts>()
.LeftJoin<EqpSpareParts>((a,b)=>a.spare_parts_id==b.id)
.LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((a, b,c,d) => d.DictionaryTypeId == c.Id && b.type_id == d.EnCode)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"]))
.WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"]))
.Select((a, b, c,d) => new EquipSparePartsQueryOutput
{
id = a.id,
type_code = d.EnCode,
type_name = d.FullName,
code = b.code,
name = b.name,
specification = b.specification
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EquipSparePartsQueryOutput>.SqlSugarPageResult(result);
}
}
}

33
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
View File

@@ -1,10 +1,13 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
@@ -129,5 +132,35 @@ namespace Tnb.EquipMgr
eqpRepairOutApply = eqpRepairOutApply,
};
}
[HttpPost]
public async Task<dynamic> GetRepairRecordList(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<EqpRepairApply>()
.LeftJoin<UserEntity>((a,b)=>a.apply_user_id==b.Id)
.LeftJoin<UserEntity>((a,b,c)=>a.repairer_id==c.Id)
.Where(a=>a.equip_id==input.equip_id)
.Select((a,b,c) => new EquipRepairRecordQueryOutput
{
id = a.id,
equip_id = a.equip_id,
code = a.code,
name = a.name,
apply_user_id =b.RealName,
is_ugent = a.is_ugent==1 ? "是" : "否",
description = a.description,
repair_description = a.repair_description,
complete_time = a.complete_time.Value.ToString("yyyy-MM-dd HH:mm"),
repairer_id = c.RealName
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EquipRepairRecordQueryOutput>.SqlSugarPageResult(result);
}
}
}

1
EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs
View File

@@ -100,7 +100,6 @@ namespace Tnb.EquipMgr
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
//todo 退回流程
if (result.IsSuccess)
{
if (string.IsNullOrEmpty(input.id))

56
EquipMgr/Tnb.EquipMgr/EqpSpEquipCheckRecordService.cs Normal file
View File

@@ -0,0 +1,56 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using Microsoft.AspNetCore.Mvc;
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 EqpSpEquipCheckRecordService : IEqpSpEquipCheckRecordService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<EqpSpEquipCheckRecord> _repository;
private readonly IUserManager _userManager;
public EqpSpEquipCheckRecordService(ISqlSugarRepository<EqpSpEquipCheckRecord> repository,
IUserManager userManager)
{
_repository = repository;
_userManager = userManager;
}
[HttpPost]
public async Task Register(EqpSpEquipCheckRecord entity)
{
if (await _repository.IsAnyAsync(x => x.equip_id == entity.equip_id))
{
throw Oops.Bah("该设备已存在检验计划");
}
if (entity.warn_unit == "1")//月
{
entity.next_check_time = entity.end_time.Value.AddMonths(-entity.warm_time.Value);
}else if (entity.warn_unit == "2")//天
{
entity.next_check_time = entity.end_time.Value.AddDays(-entity.warm_time.Value);
}
entity.id = SnowflakeIdHelper.NextId();
entity.create_time = DateTime.Now;
entity.create_id = _userManager.UserId;
entity.org_id = _userManager.GetUserInfo().Result.organizeId;
await _repository.InsertAsync(entity);
}
}
}

67
EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs Normal file
View File

@@ -0,0 +1,67 @@
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 EqpSubEquipService : IEqpSubEquipService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<EqpSubEquip> _repository;
private readonly IUserManager _userManager;
public EqpSubEquipService(ISqlSugarRepository<EqpSubEquip> repository,
IUserManager userManager)
{
_repository = repository;
_userManager = userManager;
}
[HttpPost]
public async Task<dynamic> GetSubEquipList(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<EqpSubEquip>()
.LeftJoin<UserEntity >((a, b) => a.create_id == b.Id)
.LeftJoin<UserEntity >((a, b,c) => a.modify_id == c.Id)
.LeftJoin<EqpEquipment >((a, b,c,d) => a.equip_id == d.id)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson["code"]))
.WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson["name"]))
.Select((a, b, c,d) => new SubEquipQueryOutput
{
id = a.id,
create_id = b.RealName,
create_id_id = a.create_id,
create_time = a.create_time.Value.ToString("yyyy-MM-dd"),
equip_id=d.name,
equip_id_id= a.equip_id,
code = a.code,
modify_id = c.RealName,
modify_time = a.modify_time.Value.ToString("yyyy-MM-dd"),
name = a.name,
org_id = a.org_id,
specification = a.specification,
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<SubEquipQueryOutput>.SqlSugarPageResult(result);
}
}
}

52
EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs Normal file
View File

@@ -0,0 +1,52 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
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>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
public class EqpTechnologyParameterService : IEqpTechnologyParameterService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<EqpTechnologyParameter> _repository;
private readonly IUserManager _userManager;
public EqpTechnologyParameterService(ISqlSugarRepository<EqpTechnologyParameter> repository, IUserManager userManager)
{
_userManager = userManager;
_repository = repository;
}
[HttpPost]
public async Task<dynamic> GetEquipTechnologyParameterList(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<EqpTechnologyParameter>()
.Where(a=>a.equip_id==input.equip_id)
.WhereIF(queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"]))
.Select(a => new EquipTechnologyParameterQueryOutput
{
id = a.id,
name = a.name,
definition = a.definition,
remark = a.remark
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EquipTechnologyParameterQueryOutput>.SqlSugarPageResult(result);
}
}
}

38
EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
View File

@@ -1,9 +1,11 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
@@ -142,5 +144,41 @@ namespace Tnb.EquipMgr
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "复核成功" : result.ErrorMessage;
}
[HttpPost]
public async Task<dynamic> GetMaintainRecordList(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<EqpMaintainRecordH>()
.LeftJoin<EqpEquipment>((a,b)=>a.equip_id==b.id)
.LeftJoin<UserEntity>((a,b,c)=>a.execute_user_id==c.Id)
.LeftJoin<UserEntity>((a,b,c,d)=>a.repeat_user_id==d.Id)
.Where(a=>a.equip_id==input.equip_id)
.Select((a,b,c,d) => new EquipMaintainRecordQueryOutput
{
id = a.id,
attachment = a.attachment,
create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
equip_id = b.code,
equip_id_id = a.equip_id,
repeat_remark = a.repeat_remark,
repeat_result = a.repeat_result=="1"?"合格":"不合格",
repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"),
repeat_user_id = d.RealName,
result = a.result=="1"?"合格":"不合格",
result_remark = a.result_remark,
maintain_tem_equip_id = a.maintain_tem_equip_id,
execute_time = a.execute_time.Value.ToString("yyyy-MM-dd HH:mm"),
execute_user_id = c.RealName,
status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("")
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EquipMaintainRecordQueryOutput>.SqlSugarPageResult(result);
}
}
}

35
EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
View File

@@ -1,9 +1,11 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
@@ -126,5 +128,38 @@ namespace Tnb.EquipMgr
status = SpotInsRecordExecutionStatus.COMPLETED
}, x => x.id == input.id);
}
[HttpPost]
public async Task<dynamic> GetSpotInsRecordList(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<EqpSpotInsRecordH>()
.LeftJoin<UserEntity>((a,b)=>a.repeat_user_id==b.Id)
.Where(a=>a.equip_id==input.equip_id)
.Select((a,b) => new EquipSpotInsRecordQueryOutput
{
id = a.id,
attachment = a.attachment,
create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
equip_id = a.equip_id,
repeat_remark = a.repeat_remark,
repeat_result = a.repeat_result=="1"?"合格":"不合格",
repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"),
repeat_user_id = b.RealName,
result = a.result=="1"?"合格":"不合格",
result_remark = a.result_remark,
spot_ins_tem_equip_id = a.spot_ins_tem_equip_id,
spot_record_date_time = a.spot_record_date_time.Value.ToString("yyyy-MM-dd HH:mm"),
spot_record_user_id = a.spot_record_user_id,
status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("")
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EquipSpotInsRecordQueryOutput>.SqlSugarPageResult(result);
}
}
}

4
common/Tnb.Common/Extension/StringExtensions.cs
View File

@@ -345,7 +345,7 @@ public static class StringExtensions
/// 指示指定的字符串是 null 或者 System.String.Empty 字符串.
/// </summary>
[DebuggerStepThrough]
public static bool IsNullOrEmpty(this string value)
public static bool IsNullOrEmpty(this string? value)
{
return string.IsNullOrEmpty(value);
}
@@ -363,7 +363,7 @@ public static class StringExtensions
/// 指示指定的字符串是 null、空或者仅由空白字符组成.
/// </summary>
[DebuggerStepThrough]
public static bool IsMissing(this string value)
public static bool IsMissing(this string? value)
{
return string.IsNullOrWhiteSpace(value);
}

11
message/Tnb.Message.Entitys/Entity/MessageAccountEntity.cs
View File

@@ -180,9 +180,10 @@ public class MessageAccountEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageDataTypeEntity.cs
View File

@@ -30,9 +30,10 @@ public class MessageDataTypeEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_ENCODE")]
public string? EnCode { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageMonitorEntity.cs
View File

@@ -72,9 +72,10 @@ public class MessageMonitorEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_CONTENT")]
public string? Content { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageSendEntity.cs
View File

@@ -54,9 +54,10 @@ public class MessageSendEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_USEDID")]
public string? UsedId { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageSendRecordEntity.cs
View File

@@ -30,9 +30,10 @@ public class MessageSendRecordEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_USEDID")]
public string? UsedId { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageSendTemplateEntity.cs
View File

@@ -48,9 +48,10 @@ public class MessageSendTemplateEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageShortLinkEntity.cs
View File

@@ -66,9 +66,10 @@ public class MessageShortLinkEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_USERID")]
public string? UserId { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageSmsFieldEntity.cs
View File

@@ -36,9 +36,10 @@ public class MessageSmsFieldEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_Field")]
public string? Field { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageTemplateEntity.cs
View File

@@ -84,9 +84,10 @@ public class MessageTemplateEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_DESCRIPTION")]
public string? Description { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageTemplateParamEntity.cs
View File

@@ -30,9 +30,10 @@ public class MessageTemplateParamEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_FIELD")]
public string? Field { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/MessageWechatUserEntity.cs
View File

@@ -36,9 +36,10 @@ public class MessageWechatUserEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_CLOSEMARK")]
public int? CloseMark { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
message/Tnb.Message.Entitys/Entity/UserDeviceEntity.cs
View File

@@ -24,9 +24,10 @@ public class UserDeviceEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_USERID")]
public string? UserId { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TENANTID")]
public string? TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TENANTID")]
//public string? TenantId { get; set; }
}

11
system/Tnb.Systems.Entitys/Entity/Permission/SocialsUsersEntity.cs
View File

@@ -34,11 +34,12 @@ public class SocialsUsersEntity : CEntityBase
[SugarColumn(ColumnName = "F_SocialName")]
public string SocialName { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TenantId")]
public string TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TenantId")]
//public string TenantId { get; set; }
/// <summary>
/// 备注.

11
system/Tnb.Systems.Entitys/Entity/Permission/TenantSocialsEntity.cs
View File

@@ -46,11 +46,12 @@ public class TenantSocialsEntity : CEntityBase
[SugarColumn(ColumnName = "F_SocialName")]
public string SocialName { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TenantId")]
public string TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TenantId")]
//public string TenantId { get; set; }
/// <summary>
/// 备注.

11
system/Tnb.Systems.Entitys/Entity/Permission/UserOldPasswordEntity.cs
View File

@@ -39,9 +39,10 @@ public class UserOldPasswordEntity : EntityBase<string>
[SugarColumn(ColumnName = "F_CreatorTime")]
public DateTime CreatorTime { get; set; }
/// <summary>
/// 租户ID.
/// </summary>
[SugarColumn(ColumnName = "F_TenantId")]
public string TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户ID.
///// </summary>
//[SugarColumn(ColumnName = "F_TenantId")]
//public string TenantId { get; set; }
}

93
taskschedule/Tnb.TaskScheduler/Listener/GenerateSpEquipCheckPlanTimeWorker.cs Normal file
View File

@@ -0,0 +1,93 @@
using JNPF.Common.Security;
using JNPF.Logging;
using SqlSugar;
using Tnb.EquipMgr.Entities;
namespace JNPF.TaskScheduler.Listener
{
/// <summary>
/// 生成特种设备检验计划
/// </summary>
public class GenerateSpEquipCheckPlanTimeWorker : ISpareTimeWorker
{
private ISqlSugarRepository<EqpSpEquipCheckRecord> _repository => App.GetService<ISqlSugarRepository<EqpSpEquipCheckRecord>>();
[SpareTime("0 0 0 * * ?", "生成特种设备检验计划", ExecuteType = SpareTimeExecuteTypes.Serial,StartNow = false)]
public void GenerateSpotInspectionPlan(SpareTimer timer, long count)
{
Log.Information("----------------------开始生成特种设备检验计划----------------------");
try
{
var db = _repository.AsSugarClient();
List<string> ids = _repository.GetList(x => x.status == "0").Select(x => x.equip_id).Distinct()
.ToList();
List<EqpSpEquipCheckRecord> list = db.Queryable<EqpSpEquipCheckRecord>().GroupBy(x=>new
{
x.equip_id,
}).Where(x => x.status == "1" && !ids.Contains(x.equip_id))//排除有未检验的
.Select(x=>new
{
equip_id = x.equip_id,
create_time = SqlFunc.AggregateMax(x.create_time),
})
.MergeTable()
.LeftJoin<EqpSpEquipCheckRecord>((x,y)=>x.equip_id==y.equip_id && x.create_time.Value.ToString("yyyy-MM-dd")==y.create_time.Value.ToString("yyyy-MM-dd"))
.Select((x,y)=>y)
.ToList();
List<EqpSpEquipCheckRecord> insertList = new List<EqpSpEquipCheckRecord>();
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
if (item.end_time != null && item.warn_unit!=null)
{
if (item.warn_unit == "1")
{
if (item.end_time.Value.AddMonths(-item.warm_time.Value).ToString("yyyy-MM-dd") ==
DateTime.Now.ToString("yyyy-MM-dd"))
{
insertList.Add(new EqpSpEquipCheckRecord()
{
id = SnowflakeIdHelper.NextId(),
equip_id = item.equip_id,
status = "0"
});
}
}else if (item.warn_unit == "2")
{
if (item.end_time.Value.AddDays(-item.warm_time.Value).ToString("yyyy-MM-dd") ==
DateTime.Now.ToString("yyyy-MM-dd"))
{
insertList.Add(new EqpSpEquipCheckRecord()
{
id = SnowflakeIdHelper.NextId(),
equip_id = item.equip_id,
status = "0"
});
}
}
}
}
_repository.InsertRange(insertList);
}
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Log.Error(e.Message);
}
Log.Information("----------------------结束生成特种设备检验计划----------------------");
}
}
}

69
taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
View File

@@ -16,6 +16,7 @@ using JNPF.Schedule;
using JNPF.Systems.Interfaces.System;
using JNPF.TaskScheduler.Entitys;
using JNPF.TaskScheduler.Entitys.Dto.TaskScheduler;
using JNPF.TaskScheduler.Entitys.Enum;
using JNPF.TaskScheduler.Entitys.Model;
using JNPF.TaskScheduler.Interfaces.TaskScheduler;
using JNPF.TimeCrontab;
@@ -412,40 +413,42 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
/// <returns></returns>
private async Task<List<TaskMethodInfo>> GetTaskMethods()
{
//var taskMethods = await _cacheManager.GetAsync<List<TaskMethodInfo>>(CommonConst.CACHEKEYTIMERJOB);
//if (taskMethods != null) return taskMethods;
// var taskMethods = await _cacheManager.GetAsync<List<TaskMethodInfo>>(CommonConst.CACHEKEYTIMERJOB);
// if (taskMethods != null) return taskMethods;
//// 获取所有本地任务方法，必须有spareTimeAttribute特性
//taskMethods = App.EffectiveTypes
// .Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(ISpareTimeWorker).IsAssignableFrom(u))
// .SelectMany(u => u.GetMethods(BindingFlags.Public | BindingFlags.Instance)
// .Where(m => m.IsDefined(typeof(SpareTimeAttribute), false) &&
// m.GetParameters().Length == 2 &&
// m.GetParameters()[0].ParameterType == typeof(SpareTimer) &&
// m.GetParameters()[1].ParameterType == typeof(long) && m.ReturnType == typeof(void))
// .Select(m =>
// {
// // 默认获取第一条任务特性
// var spareTimeAttribute = m.GetCustomAttribute<SpareTimeAttribute>();
// return new TaskMethodInfo
// {
// id = $"{m.DeclaringType.Name}/{m.Name}",
// fullName = spareTimeAttribute.WorkerName,
// RequestUrl = $"{m.DeclaringType.Name}/{m.Name}",
// cron = spareTimeAttribute.CronExpression,
// DoOnce = spareTimeAttribute.DoOnce,
// ExecuteType = spareTimeAttribute.ExecuteType,
// Interval = (int)spareTimeAttribute.Interval / 1000,
// StartNow = spareTimeAttribute.StartNow,
// RequestType = RequestTypeEnum.BuiltIn,
// Remark = spareTimeAttribute.Description,
// TimerType = string.IsNullOrEmpty(spareTimeAttribute.CronExpression) ? SpareTimeTypes.Interval : SpareTimeTypes.Cron,
// MethodName = m.Name,
// DeclaringType = m.DeclaringType
// };
// })).ToList();
//await _cacheManager.SetAsync(CommonConst.CACHEKEYTIMERJOB, taskMethods);
//return taskMethods;
List<TaskMethodInfo> taskMethods = null;
// 获取所有本地任务方法，必须有spareTimeAttribute特性
taskMethods = App.EffectiveTypes
.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(ISpareTimeWorker).IsAssignableFrom(u))
.SelectMany(u => u.GetMethods(BindingFlags.Public | BindingFlags.Instance)
.Where(m => m.GetCustomAttributes(typeof(SpareTimeAttribute), false).ToString().Contains("SpareTime") &&
m.GetParameters().Length == 2 &&
m.GetParameters()[0].ParameterType == typeof(SpareTimer) &&
m.GetParameters()[1].ParameterType == typeof(long) && m.ReturnType == typeof(void))
.Select(m =>
{
// 默认获取第一条任务特性
var spareTimeAttribute = m.GetCustomAttribute<SpareTimeAttribute>();
return new TaskMethodInfo
{
id = $"{m.DeclaringType.Name}/{m.Name}",
fullName = spareTimeAttribute.WorkerName,
RequestUrl = $"{m.DeclaringType.Name}/{m.Name}",
cron = spareTimeAttribute.CronExpression,
DoOnce = spareTimeAttribute.DoOnce,
ExecuteType = spareTimeAttribute.ExecuteType,
Interval = (int)spareTimeAttribute.Interval / 1000,
StartNow = spareTimeAttribute.StartNow,
RequestType = RequestTypeEnum.BuiltIn,
Remark = spareTimeAttribute.Description,
TimerType = string.IsNullOrEmpty(spareTimeAttribute.CronExpression) ? SpareTimeTypes.Interval : SpareTimeTypes.Cron,
MethodName = m.Name,
DeclaringType = m.DeclaringType
};
})).ToList();
await _cacheManager.SetAsync(CommonConst.CACHEKEYTIMERJOB, taskMethods);
return taskMethods;
return new List<TaskMethodInfo>();
}

9
visualdev/Tnb.VisualDev.Engine/Model/IndexGridFieldModel.cs
View File

@@ -8,10 +8,11 @@ namespace JNPF.VisualDev.Engine;
[SuppressSniffer]
public class IndexGridFieldModel : IndexEachConfigBase
{
/// <summary>
/// 对齐.
/// </summary>
public string align { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 对齐.
///// </summary>
//public string align { get; set; }
/// <summary>
/// 固定.

9
visualdev/Tnb.VisualDev.Engine/Model/IndexSearchFieldModel.cs
View File

@@ -14,10 +14,11 @@ public class IndexSearchFieldModel : IndexEachConfigBase
/// </summary>
public string value { get; set; }
/// <summary>
/// 查询类型.
/// </summary>
public int? searchType { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 查询类型.
///// </summary>
//public int? searchType { get; set; }
}
/// <summary>

11
visualdev/Tnb.VisualDev.Entitys/Entity/VisualDevShortLinkEntity.cs
View File

@@ -93,9 +93,10 @@ public class VisualDevShortLinkEntity : CLDEntityBase
[SugarColumn(ColumnName = "F_UserId")]
public string UserId { get; set; }
/// <summary>
/// 租户id.
/// </summary>
[SugarColumn(ColumnName = "F_TenantId")]
public string TenantId { get; set; }
// modified by PhilPan 基类包含此属性
///// <summary>
///// 租户id.
///// </summary>
//[SugarColumn(ColumnName = "F_TenantId")]
//public string TenantId { get; set; }
}