点巡检计划定时任务

2023-05-16 15:46:41 +08:00
parent ed87bd712c
commit 5145ea0e1a
8 changed files with 480 additions and 22 deletions
--- a/taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs
+++ b/taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs
@@ -1,11 +1,171 @@
+using JNPF.Common.Security;
+using JNPF.Logging;
+using Microsoft.AspNetCore.Components;
+using SqlSugar;
+using Tnb.EquipMgr.Entities;
+
 namespace JNPF.TaskScheduler.Listener
 {
+    /// <summary>
+    /// 生成点巡检计划
+    /// </summary>
    public class GenerateSpotInspectionPlanTimeWorker : ISpareTimeWorker
    {
-        [SpareTime("0 45 14 * * ? *", "生成点巡检计划", ExecuteType = SpareTimeExecuteTypes.Serial,StartNow = false)]
+        private ISqlSugarRepository<EqpSpotInsTemEquipH> _repository => App.GetService<ISqlSugarRepository<EqpSpotInsTemEquipH>>();
+        // public GenerateSpotInspectionPlanTimeWorker(ISqlSugarRepository<EqpSpotInsTemEquipH> repository)
+        // {
+        //     _repository = repository;
+        // }
+
+        [SpareTime("0 0 0 * * ?", "生成点巡检计划", ExecuteType = SpareTimeExecuteTypes.Serial,StartNow = false)]
        public void GenerateSpotInspectionPlan(SpareTimer timer, long count)
        {
-            Console.WriteLine("hello world");
+            Log.Information("----------------------开始生成点巡检计划----------------------");
+
+            try
+            {
+                List<EqpSpotInsTemEquipH> eqpSpotInsTemEquipHsByOne = _repository.GetList(x => x.is_start=="1" && x.plan_cycle_unit == "1");
+                List<EqpSpotInsTemEquipH> eqpSpotInsTemEquipHsByCirculate = _repository.GetList(x => x.is_start=="1" && x.plan_cycle_unit == "2");
+                List<EqpSpotInsRecordH> tobeCreateList = new List<EqpSpotInsRecordH>();
+                List<EqpSpotInsTemEquipH> tobeCreateTemplets = new List<EqpSpotInsTemEquipH>();
+                var db = _repository.AsSugarClient();
+                
+                foreach (var item in eqpSpotInsTemEquipHsByOne)
+                {
+                    if (item.start_time.AddHours((double)item.plan_cycle).ToString("yyyy-MM-dd HH:mm") == DateTime.Now.ToString("yyyy-MM-dd HH:mm"))
+                    {
+                        tobeCreateTemplets.Add(item);
+                    }
+                }
+                
+                if (eqpSpotInsTemEquipHsByCirculate != null && eqpSpotInsTemEquipHsByCirculate.Count > 0)
+                {
+                    List<string> ids = eqpSpotInsTemEquipHsByCirculate.Select(x => x.id).ToList();
+                    List<SpotInsRecordLastDTO> lastPlans = db.Queryable<EqpSpotInsRecordH>()
+                        .GroupBy(a => new { a.spot_ins_tem_equip_id })
+                        .Where(a => ids.Contains(a.spot_ins_tem_equip_id))
+                        .Select(a => new SpotInsRecordLastDTO()
+                        {
+                            spot_ins_tem_equip_id = a.spot_ins_tem_equip_id,
+                            create_time = SqlFunc.AggregateMax(a.create_time.Value)
+                        }).ToList();
+                    
+                    foreach (var item in eqpSpotInsTemEquipHsByCirculate)
+                    {
+                        var lastPlan = lastPlans.FirstOrDefault(x => x.spot_ins_tem_equip_id == item.id);
+                        if (lastPlan == null || lastPlan.create_time == null || lastPlan.create_time.AddHours((double)item.plan_cycle).ToString("yyyy-MM-dd HH") == DateTime.Now.ToString("yyyy-MM-dd HH"))
+                        {
+                            tobeCreateTemplets.Add(item);
+                        }
+                    }
+                }
+                
+                if (tobeCreateTemplets != null && tobeCreateTemplets.Count > 0)
+                {
+                    List<EqpEquipment> equipments = db.Queryable<EqpEquipment>().Where(x => x.life==Tnb.EquipMgr.EquipmentLife.ENABLE).ToList();
+                    int index = 1;
+                    foreach (var item in tobeCreateTemplets)
+                    {
+                        //只有启用设备才生成计划
+                        if (equipments.FirstOrDefault(x => x.id == item.equip_id) == null)
+                            continue;
+                        
+                        string code = $"{DateTime.Now.ToString("yyyyMMddHH")+(index++).ToString().PadLeft(3,'0')}";
+                        tobeCreateList.Add(new EqpSpotInsRecordH()
+                        {
+                            id = SnowflakeIdHelper.NextId(),
+                            code = code,
+                            // equip_type_id = item.equip_type_id,
+                            equip_id = item.equip_id,
+                            spot_ins_tem_equip_id = item.id,
+                            plan_run_notice = item.plan_run_notice,
+                            plan_run_notice_unit = item.plan_run_notice_unit,
+                            plan_delay = item.plan_delay,
+                            plan_delay_unit = item.plan_delay_unit,
+                            send_post_info_user_id = item.send_post_info_user_id,
+                            is_repeat = item.is_repeat,
+                            repeat_post_info_user_id = item.repeat_post_info_user_id,
+                            is_send = item.is_send,
+                            create_time = DateTime.Now,
+                        });
+                    }
+                }
+
+
+                if (tobeCreateList != null && tobeCreateList.Count > 0)
+                {
+                    List<string> templetIDs = tobeCreateList.Select(x => x.spot_ins_tem_equip_id).ToList();
+                    List<EqpSpotInsTemEquipD> spotInsTemEquipDs = db.Queryable<EqpSpotInsTemEquipD>().Where(x => templetIDs.Contains(x.spot_ins_tem_equip_id)).ToList();
+                    List<string> spotInsItemIDs = spotInsTemEquipDs.Select(x => x.spot_ins_item_id).ToList();
+                    List<EqpSpotInsItem> spotCheckItems = db.Queryable<EqpSpotInsItem>().Where(x => spotInsItemIDs.Contains(x.id)).ToList();
+
+                    
+                    foreach (var tobeCreatePlan in tobeCreateList)
+                    {
+                        List<EqpSpotInsRecordD> spotInsRecordDs = new List<EqpSpotInsRecordD>();
+                        List<string> spotInsItems = spotInsTemEquipDs
+                            .Where(x => x.spot_ins_tem_equip_id == tobeCreatePlan.spot_ins_tem_equip_id)
+                            .Select(x => x.spot_ins_item_id).ToList();
+                        List<EqpSpotInsItem> tobeCreateItems = spotCheckItems.Where(x => spotInsItems.Contains(x.id)).ToList();
+                        foreach (var tobeCreateItem in tobeCreateItems)
+                        {
+                            spotInsRecordDs.Add(new EqpSpotInsRecordD()
+                            {
+                                id = SnowflakeIdHelper.NextId(),
+                                spot_ins_record_id = tobeCreatePlan.id,
+                                spot_ins_tem_equip_id = tobeCreatePlan.spot_ins_tem_equip_id,
+                                spot_ins_item_id = tobeCreateItem.id,
+                                code = tobeCreateItem.code,
+                                name = tobeCreateItem.name,
+                                judge_type = tobeCreateItem.judge_type,
+                                low_value = tobeCreateItem.low_value,
+                                high_value = tobeCreateItem.high_value,
+                                low_value_is_include = tobeCreateItem.low_value_is_include,
+                                high_value_is_include = tobeCreateItem.high_value_is_include,
+                                standard_value = tobeCreateItem.standard_value,
+                                unit_id = tobeCreateItem.unit_id,
+                                inspection_method = tobeCreateItem.inspection_method,
+                                judge_content = tobeCreateItem.judge_content,
+                                remark = tobeCreateItem.remark
+                            });
+                        }
+
+                        var dbResult = db.Ado.UseTran(() =>
+                        {
+                            if (tobeCreateList != null && tobeCreateList.Count > 0)
+                            {
+                                db.Insertable<EqpSpotInsRecordH>(tobeCreateList).ExecuteCommand();
+                            }
+
+                            if (spotInsRecordDs != null && spotInsRecordDs.Count > 0)
+                            {
+                                db.Insertable<EqpSpotInsRecordD>(spotInsRecordDs).ExecuteCommand();
+                            }
+                        });
+                        if (!dbResult.IsSuccess)
+                        {
+                            Log.Error(dbResult.ErrorMessage);
+                        }
+                        Log.Information($"---------------生成{tobeCreateList.Count}个计划---------------");
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error(e.Message);
+            }
+
+            
+            Log.Information("----------------------结束生成点巡检计划----------------------");
+        }
+        
+        /// <summary>
+        /// 最后一个点巡检记录
+        /// </summary>
+        private class SpotInsRecordLastDTO
+        {
+            public string spot_ins_tem_equip_id { get; set; }
+            public DateTime create_time { get; set; }
        }
    }
 }
--- a/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
+++ b/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
@@ -324,11 +324,12 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
        Action<SpareTimer, long>? action = null;
        ContentModel? comtentModel = input.ExecuteContent.ToObject<ContentModel>();
        input.ExecuteCycleJson = comtentModel.cron;
+        TaskMethodInfo? taskMethod = null;
        switch (input.ExecuteType)
        {
            case "3":
                // 查询符合条件的任务方法
-                TaskMethodInfo? taskMethod = GetTaskMethods()?.Result.FirstOrDefault(m => m.id == comtentModel.localHostTaskId);
+                taskMethod = GetTaskMethods()?.Result.FirstOrDefault(m => m.id == comtentModel.localHostTaskId);
                if (taskMethod == null) break;

                // 创建任务对象
@@ -354,20 +355,20 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
        {
            interval = (starTime.ParseToDateTime() - DateTime.Now).TotalMilliseconds.ParseToInt();
        }
-        SpareTime.DoOnce(interval, action, "Once_" + input.Id);
-        SpareTime.Do(
-            () =>
-            {
-                var isRun = comtentModel.endTime.IsNullOrEmpty() ? DateTime.Now >= starTime : DateTime.Now >= starTime && DateTime.Now < endTime;
-                if (isRun)
-                {
-                    return SpareTime.GetCronNextOccurrence(comtentModel.cron);
-                }
-                else
-                {
-                    return null;
-                }
-            },
+
+        if (taskMethod.StartNow) //modifyby zhoukeda 20230516
+        {
+            SpareTime.DoOnce(interval, action, "Once_" + input.Id);
+        }
+
+        Func<DateTimeOffset?> nextHandle = null;
+        var isRun = comtentModel.endTime.IsNullOrEmpty() ? DateTime.Now >= starTime : DateTime.Now >= starTime && DateTime.Now < endTime;
+        if (isRun)
+        {
+            nextHandle = ()=>SpareTime.GetCronNextOccurrence(comtentModel.cron);
+        }
+        SpareTime.Do(nextHandle
+            ,
            action, input.Id, comtentModel.ConnectionConfig.ToJsonString(), true, executeType: SpareTimeExecuteTypes.Parallel, cancelInNoneNextTime: false);
    }

--- a/taskschedule/Tnb.TaskScheduler/Tnb.TaskScheduler.csproj
+++ b/taskschedule/Tnb.TaskScheduler/Tnb.TaskScheduler.csproj
@@ -10,8 +10,13 @@

  <ItemGroup>
    <ProjectReference Include="..\..\common\Tnb.Common.Core\Tnb.Common.Core.csproj" />
+    <ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Entities\Tnb.EquipMgr.Entities.csproj" />
    <ProjectReference Include="..\..\system\Tnb.Systems.Interfaces\Tnb.Systems.Interfaces.csproj" />
    <ProjectReference Include="..\Tnb.TaskScheduler.Interfaces\Tnb.TaskScheduler.Interfaces.csproj" />
  </ItemGroup>

+  <ItemGroup>
+    <PackageReference Include="Tnb.Core" Version="2023.3.24.1010" />
+  </ItemGroup>
+
 </Project>