升级更新

lixiaojun

2024-04-04 0a48aec6a38d34db6e9194920aac7d2d19cadcb3

升级更新

 IStation.Application.SZJT/01-logic-policy/1-mgr/LogicPolicy_Controller.cs

@@ -64,14 +64,14 @@
            {
                if (_service.IsExistCode(input.Code))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagName(input.TagName))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var model = input.Adapt<AddLogicPolicyInput, Model.LogicPolicy>();
@@ -94,20 +94,20 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCodeExceptID(input.Code, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var rhs = new Model.LogicPolicy(model);
@@ -176,7 +176,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                    throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -257,7 +257,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 IStation.Application.SZJT/01-logic-policy/2-std/LogicPolicy_StdController.cs

@@ -24,7 +24,7 @@
                Service.LogicPolicy.PublishCache(cacheKey);
                var vmList = all?.Select(x => new LogicPolicyStdDto(x)).ToList();
                return vmList;
            }, CacheHelper.CacheLevel1);
            }, Yw.Service.ConfigHelper.CacheLevel1);
            return vm_list;
        }


 IStation.Application.SZJT/02-logic-area/1-mgr/LogicArea_Controller.cs

@@ -75,20 +75,20 @@
            var policy = new Service.LogicPolicy().GetByID(input.PolicyID);
            if (policy == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PolicyID:{input.PolicyID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PolicyID:{input.PolicyID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCode(input.Code))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagName(input.TagName))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var model = input.Adapt<AddLogicAreaInput, Model.LogicArea>();
@@ -111,20 +111,20 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCodeExceptID(input.Code, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var rhs = new Model.LogicArea(model);
@@ -193,7 +193,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                    throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -274,7 +274,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 IStation.Application.SZJT/02-logic-area/2-std/LogicArea_StdController.cs

@@ -25,7 +25,7 @@
                Service.LogicArea.PublishCache(cacheKey);
                var vmList = all?.Select(x => new LogicAreaStdDto(x)).ToList();
                return vmList;
            }, CacheHelper.CacheLevel5);
            }, Yw.Service.ConfigHelper.CacheLevel5);
            return vm_list;
        }

@@ -45,7 +45,7 @@
                Service.LogicArea.PublishCache(cacheKey);
                var vmList = all?.Select(x => new LogicAreaStdDto(x)).ToList();
                return vmList;
            }, CacheHelper.CacheLevel5);
            }, Yw.Service.ConfigHelper.CacheLevel5);
            return vm_list;
        }


 IStation.Application.SZJT/03-logic-site/1-mgr/LogicSite_Controller.cs

@@ -64,14 +64,14 @@
            {
                if (_service.IsExistCode(input.Code))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagName(input.TagName))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var model = input.Adapt<AddLogicSiteInput, Model.LogicSite>();
@@ -94,20 +94,20 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCodeExceptID(input.Code, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var rhs = new Model.LogicSite(model);
@@ -176,7 +176,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                    throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -257,7 +257,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 IStation.Application.SZJT/03-logic-site/2-std/LogicSite_StdController.cs

@@ -25,7 +25,7 @@
                Service.LogicSite.PublishCache(cacheKey);
                var vmList = all?.Select(x => new LogicSiteStdDto(x)).ToList();
                return vmList;
            }, CacheHelper.CacheLevel1);
            }, Yw.Service.ConfigHelper.CacheLevel1);
            return vm_list;
        }


 IStation.Application.SZJT/04-logic-tree/1-mgr/LogicTree_Controller.cs

@@ -98,11 +98,11 @@
            var policy = new Service.LogicPolicy().GetByID(input.PolicyID);
            if (policy == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PolicyID:{input.PolicyID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PolicyID:{input.PolicyID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (_service.IsExist(input.PolicyID, input.LogicType, input.LogicID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"LogicType:{input.LogicType}，LogicID:{input.LogicID} å·²å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"LogicType:{input.LogicType}，LogicID:{input.LogicID} å·²å­˜åœ¨");
            }
            var parentIds = new List<long>();
            if (input.ParentID > 0)
@@ -110,11 +110,11 @@
                var parent = _service.GetByID(input.ParentID);
                if (parent == null)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ParentID:{input.ParentID} æ•°æ®ä¸å­˜åœ¨");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ParentID:{input.ParentID} æ•°æ®ä¸å­˜åœ¨");
                }
                if (parent.PolicyID != input.PolicyID)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"ParentID:{input.ParentID} ä¸Ž PolicyID:{input.PolicyID} ä¸åŒ¹é…");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"ParentID:{input.ParentID} ä¸Ž PolicyID:{input.PolicyID} ä¸åŒ¹é…");
                }
                parentIds = TreeParentIdsHelper.GetChildParentIds(parent.ID, parent.ParentIds);
            }
@@ -162,7 +162,7 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw Oops.Oh(ErrorCodes.D001, $"ID:{input.ID}");
                throw Oops.Oh(InternalErrorCodes.D001, $"ID:{input.ID}");
            }
            var parentIds = new List<long>();
            if (input.ParentID > 0)
@@ -170,7 +170,7 @@
                var parent = _service.GetByID(input.ParentID);
                if (parent == null)
                {
                    throw Oops.Oh(ErrorCodes.D001, $"ParentID:{input.ParentID}");
                    throw Oops.Oh(InternalErrorCodes.D001, $"ParentID:{input.ParentID}");
                }
                parentIds = TreeParentIdsHelper.GetChildParentIds(parent.ID, parent.ParentIds);
            }
@@ -235,7 +235,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }
@@ -254,7 +254,7 @@
            var policy = new Service.LogicPolicy().GetByID(input.PolicyID);
            if (policy == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PolicyID:{input.PolicyID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PolicyID:{input.PolicyID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (input.TreeList != null && input.TreeList.Count > 0)
            {
@@ -268,13 +268,13 @@

                if (tempList.Exists(x => x.LogicType == IStation.DataType.LogicSite && x.Children != null && x.Children.Count > 0))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"节点逻辑关系错误，请检查后重试！");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"节点逻辑关系错误，请检查后重试！");
                }

                var groupTreeList = tempList.GroupBy(x => new { x.LogicType, x.LogicID }).ToList();
                if (groupTreeList.Exists(x => x.Count() > 1))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"节点不能重复，请检查后重试！");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"节点不能重复，请检查后重试！");
                }

            }

 IStation.Application.SZJT/04-logic-tree/2-std/LogicTree_StdController.cs

@@ -25,7 +25,7 @@
                Service.LogicTree.PublishCache(cacheKey);
                var vmList = list?.Select(x => new LogicTreeItemDto(x)).ToList();
                return vmList;
            }, CacheHelper.CacheLevel5);
            }, Yw.Service.ConfigHelper.CacheLevel5);
            return vm_list;

        }
@@ -65,7 +65,7 @@
                    tempList.Add(vm);
                }
                return vmList;
            }, CacheHelper.CacheLevel5);
            }, Yw.Service.ConfigHelper.CacheLevel5);
            return vm_list;

        }

 IStation.Application.SZJT/05-logic-dma/1-mgr/LogicDma_Controller.cs

@@ -64,14 +64,14 @@
            {
                if (_service.IsExistCode(input.Code))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagName(input.TagName))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var model = input.Adapt<AddLogicDmaInput, Model.LogicDma>();
@@ -94,20 +94,20 @@
            var model = _service.GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            if (!string.IsNullOrEmpty(input.Code))
            {
                if (_service.IsExistCodeExceptID(input.Code, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code}", "编码已存在");
                }
            }
            if (!string.IsNullOrEmpty(input.TagName))
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记已存在");
                }
            }
            var rhs = new Model.LogicDma(model);
@@ -176,7 +176,7 @@
            {
                if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                {
                    throw Oops.Oh(ErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                    throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "标记名称已存在");
                }
            }
            var bol = _service.UpdateTagName(input.ID, input.TagName);
@@ -257,7 +257,7 @@
            var bol = _service.DeleteByID(input.ID, out string Msg);
            if (!bol)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, Msg);
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, Msg);
            }
            return bol;
        }

 IStation.Application.SZJT/05-logic-dma/2-std/LogicDma_StdController.cs

@@ -25,7 +25,7 @@
                Service.LogicDma.PublishCache(cacheKey);
                var vmList = all?.Select(x => new LogicDmaStdDto(x)).ToList();
                return vmList;
            }, CacheHelper.CacheLevel1);
            }, Yw.Service.ConfigHelper.CacheLevel1);
            return vm_list;
        }


 IStation.Application.SZJT/99-logic/01-monitor-org/MonitorOrg_LogicController.cs

@@ -54,7 +54,7 @@
                    }
                }
                return vmList;
            }, CacheHelper.CacheLevel5);
            }, Yw.Service.ConfigHelper.CacheLevel5);
            return vm_list;
        }


 IStation.Application.SZJT/99-logic/01-monitor-org/dto/MonitorFullLogicalTreeDto.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// 
    /// </summary>
    public class MonitorFullLogicalTreeDto : Yw.Application.LogicalTreeDto
    public class MonitorFullLogicalTreeDto : Yw.Dto.LogicalTreeDto
    {
        /// <summary>
        /// 

 IStation.Application.SZJT/99-logic/02-equipmnet-org/AssetsOrg_LogicController.cs

@@ -47,7 +47,7 @@
                }

                return vmList;
            }, CacheHelper.CacheLevel5);
            }, Yw.Service.ConfigHelper.CacheLevel5);
            return vm_list;
        }


 IStation.Application.SZJT/99-logic/02-equipmnet-org/dto/EquipmentFullLogicalTreeDto.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// 
    /// </summary>
    public class EquipmentFullLogicalTreeDto : Yw.Application.LogicalTreeDto
    public class EquipmentFullLogicalTreeDto : Yw.Dto.LogicalTreeDto
    {
        /// <summary>
        /// 

 IStation.Application.SZJT/99-logic/07-dma-analy/DmaAnaly_LogicController.cs

@@ -88,7 +88,7 @@
            var model = new Yw.Service.DmaArea().GetByID(input.ID);
            if (model == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            var vm = new DmaAnalyAreaDetailDto(model);

@@ -213,7 +213,7 @@
            var site = new Yw.Service.DmaSite().GetByID(input.ID);
            if (site == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            var vm = new DmaAnalySiteDetailDto(site);

@@ -241,7 +241,7 @@
            var site = new Yw.Service.DmaSite().GetByID(input.ID);
            if (site == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            var binding = new Yw.Service.DmaSiteBinding().GetValidBySiteID(site.ID);
            if (binding == null)
@@ -367,7 +367,7 @@
            var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
            if (catalogList == null || catalogList.Count < 1)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "流量计分类编码验证失败");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "流量计分类编码验证失败");
            }
            var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();

@@ -475,7 +475,7 @@
            var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
            if (catalogList == null || catalogList.Count < 1)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "压力计分类编码验证失败");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "压力计分类编码验证失败");
            }
            var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();


 IStation.Application.SZJT/99-logic/08-flow-meter-map/FlowMeterMap_LogicController.cs

@@ -18,7 +18,7 @@
            var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
            if (catalogList == null || catalogList.Count < 1)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "流量计分类编码验证失败");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "流量计分类编码验证失败");
            }
            var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();


 IStation.Application.SZJT/99-logic/09-press-meter-map/PressMeterMap_LogicController.cs

@@ -18,7 +18,7 @@
            var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
            if (catalogList == null || catalogList.Count < 1)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "压力计分类编码验证失败");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "压力计分类编码验证失败");
            }
            var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();


 IStation.Application.SZJT/99-logic/10-mobile/01-station-list/StationList_LogicController.cs

@@ -96,7 +96,7 @@


                return vmList;
            }, CacheHelper.CacheLevel1);
            }, Yw.Service.ConfigHelper.CacheLevel1);
            return vm_list;

        }

 IStation.Application.SZJT/99-logic/10-mobile/02-meter-list/MeterList_MobileController.cs

@@ -135,7 +135,7 @@
                #endregion

                return vmList;
            }, CacheHelper.CacheLevel1);
            }, Yw.Service.ConfigHelper.CacheLevel1);
            return vm_list;

        }

 IStation.Application.SZJT/99-logic/10-mobile/05-map/Map_MobileController.cs

@@ -42,7 +42,7 @@
                }
                return vmList;

            }, CacheHelper.CacheLevel3);
            }, Yw.Service.ConfigHelper.CacheLevel3);
            return vm_list;
        }

@@ -56,7 +56,7 @@
            var station = new Service.LogicSite().GetByID(input.StationID);
            if (station == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"StationID:{input.StationID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"StationID:{input.StationID} æ•°æ®ä¸å­˜åœ¨");
            }
            var vm = new StationMapMonitorKpiInfoMobileDto(station);

@@ -109,7 +109,7 @@
                Yw.Service.SysCatalog.PublishCache(cacheKey);
                if (catalogList == null || catalogList.Count < 1)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "流量计分类编码验证失败");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "流量计分类编码验证失败");
                }
                var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();

@@ -139,7 +139,7 @@

                return vmList;

            }, CacheHelper.CacheLevel3);
            }, Yw.Service.ConfigHelper.CacheLevel3);
            return vm_list;
        }

@@ -153,17 +153,17 @@
            var equipment = new Yw.Service.Equipment().GetByID(input.FlowMeterID);
            if (equipment == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"FlowMeterID:{input.FlowMeterID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"FlowMeterID:{input.FlowMeterID} æ•°æ®ä¸å­˜åœ¨");
            }
            var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.FlowMeter);
            if (catalogList == null || catalogList.Count < 1)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "流量计分类编码验证失败");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "流量计分类编码验证失败");
            }
            var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
            if (!catalogIds.Contains(equipment.CatalogID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"FlowMeterID:{input.FlowMeterID} è¯·è¾“入正确流量计id");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"FlowMeterID:{input.FlowMeterID} è¯·è¾“入正确流量计id");
            }

            var vm = new FlowMeterMapMonitorKpiInfoMobileDto();
@@ -235,7 +235,7 @@
                Yw.Service.SysCatalog.PublishCache(cacheKey);
                if (catalogList == null || catalogList.Count < 1)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "压力计分类编码验证失败");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "压力计分类编码验证失败");
                }
                var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();

@@ -265,7 +265,7 @@

                return vmList;

            }, CacheHelper.CacheLevel3);
            }, Yw.Service.ConfigHelper.CacheLevel3);
            return vm_list;
        }

@@ -279,17 +279,17 @@
            var equipment = new Yw.Service.Equipment().GetByID(input.PressMeterID);
            if (equipment == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"PressMeterID:{input.PressMeterID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"PressMeterID:{input.PressMeterID} æ•°æ®ä¸å­˜åœ¨");
            }
            var catalogList = new Yw.Service.SysCatalog().GetChildAndSelfByCode(IStation.Catalog.PressMeter);
            if (catalogList == null || catalogList.Count < 1)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, "压力计分类编码验证失败");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, "压力计分类编码验证失败");
            }
            var catalogIds = catalogList.Select(x => x.ID).Distinct().ToList();
            if (!catalogIds.Contains(equipment.CatalogID))
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"PressMeterID:{input.PressMeterID} è¯·è¾“入正确压力计id");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"PressMeterID:{input.PressMeterID} è¯·è¾“入正确压力计id");
            }

            var vm = new PressMeterMapMonitorKpiInfoMobileDto();
@@ -377,7 +377,7 @@
                var request = new Yw.Service.RepairRequestForm().GetByID(FormID);
                if (request == null)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"FormID:{FormID} æ•°æ®ä¸å­˜åœ¨");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"FormID:{FormID} æ•°æ®ä¸å­˜åœ¨");
                }
                return new RepairMapStatusMobileDto(request);
            }
@@ -386,12 +386,12 @@
                var task = new Yw.Service.RepairTaskForm().GetByID(FormID);
                if (task == null)
                {
                    throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"FormID:{FormID} æ•°æ®ä¸å­˜åœ¨");
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"FormID:{FormID} æ•°æ®ä¸å­˜åœ¨");
                }
                return new RepairMapStatusMobileDto(task);
            }

            throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"FormType å‚数错误");
            throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"FormType å‚数错误");

        }

@@ -430,7 +430,7 @@
                }

                return vm_list;
            }, CacheHelper.CacheLevel3);
            }, Yw.Service.ConfigHelper.CacheLevel3);
            return vm_list;
        }


 IStation.Application.SZJT/99-logic/10-mobile/07-station-assets/StationAssets_MobileController.cs

@@ -35,7 +35,7 @@
                    vmList.Add(vm);
                }
                return vmList;
            }, CacheHelper.CacheLevel3);
            }, Yw.Service.ConfigHelper.CacheLevel3);

            if (vm_list != null && vm_list.Count > 0)
            {
@@ -63,7 +63,7 @@
            var equipment = service_equipment.GetByID(input.ID);
            if (equipment == null)
            {
                throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} æ•°æ®ä¸å­˜åœ¨");
            }
            var supplier = new Yw.Service.Supplier().GetByID(equipment.SupplierID);


 IStation.Application.SZJT/99-logic/10-mobile/08-station-statistics/StationStatistics_MobileController.cs

@@ -99,7 +99,7 @@
                }

                return monthRecord;
            }, CacheHelper.CacheLevel1);
            }, Yw.Service.ConfigHelper.CacheLevel1);

            return vm_list;


 IStation.Application.SZJT/99-logic/11-big-screen/BigScreen_LogicController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,623 @@
namespace IStation.Application
{
    /// <summary>
    /// BigScreen
    /// </summary>
    [Route("SZJT/Big/Screen/Logic")]
    [ApiDescriptionSettings("SZJT", Name = "大屏(Logic)", Order = 1000)]
    public class BigScreen_LogicController : IDynamicApiController
    {

        #region æ‰€æœ‰

        /// <summary>
        /// èŽ·å–所有泵站kpi信息
        /// </summary>
        [Route("GetAllStationKpiInfo@V1.0")]
        [HttpGet]
        public BigScreenAllStationKpiDto GetAllStationKpiInfo()
        {
            var vm = new BigScreenAllStationKpiDto();
            vm.Lws = new BigScreenAllStationKpiItemDto()
            {
                Name = "当日累计供水量",
                Value = "1120",
                UnitName = "m³"
            };
            vm.Lps = new BigScreenAllStationKpiItemDto()
            {
                Name = "当日累计用电量",
                Value = "2300",
                UnitName = "kW‧h"
            };
            vm.Sws = new BigScreenAllStationKpiItemDto()
            {
                Name = "当前瞬时总流量",
                Value = "2300.2",
                UnitName = "m³/h"
            };
            vm.Sps = new BigScreenAllStationKpiItemDto()
            {
                Name = "当前瞬时总功率",
                Value = "2600.2",
                UnitName = "kW"
            };
            vm.Tsc = new BigScreenAllStationKpiItemDto()
            {
                Name = "泵站总数量",
                Value = "13",
                UnitName = "座"
            };
            vm.Rsc = new BigScreenAllStationKpiItemDto()
            {
                Name = "运行泵站数量",
                Value = "10",
                UnitName = "座"
            };
            vm.Tpc = new BigScreenAllStationKpiItemDto()
            {
                Name = "机组总数",
                Value = "50",
                UnitName = "台"
            };
            vm.Rpc = new BigScreenAllStationKpiItemDto()
            {
                Name = "运行机组数量",
                Value = "40",
                UnitName = "台"
            };
            return vm;
        }

        /// <summary>
        /// èŽ·å–所有泵站项列表
        /// </summary>
        [Route("GetAllStationItemList@V1.0")]
        [HttpGet]
        public List<BigScreenAllStationListItemDto> GetAllStationItemList()
        {
            var allStationList = new Service.LogicSite().GetAll();
            if (allStationList == null || allStationList.Count < 1)
            {
                return default;
            }

            var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
            var service_monitor_record = new Lazy<Yw.Service.MonitorRealRecord>(() => new Yw.Service.MonitorRealRecord());

            var vmList = new List<BigScreenAllStationListItemDto>();
            foreach (var station in allStationList)
            {
                var vm = new BigScreenAllStationListItemDto();
                vm.ID = station.ID;
                vm.Name = station.Name;
                vmList.Add(vm);
                var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByBelongTypeAndBelongID(IStation.DataType.LogicSite, station.ID, Yw.Monitor.eCronType.Real);
                if (allMonitorList != null && allMonitorList.Count > 0)
                {
                    var monitorQ = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.瞬时流量));
                    if (monitorQ != null)
                    {
                        var signalQ = monitorQ.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.瞬时流量);
                        vm.Qk = new BigScreenAllStationListKpiItemDto()
                        {
                            Name = "瞬时流量",
                            Value = null,
                            UnitName = signalQ.GetDisplayUnitName()
                        };
                        var recordQ = service_monitor_record.Value.GetLastRecord(signalQ.ID);
                        if (recordQ != null)
                        {
                            vm.Qk.Value = signalQ.GetDisplayValue(recordQ.DataValue);
                        }
                    }

                    var monitorPr = allMonitorList.Find(x => x.Flags.Contains(Yw.Monitor.Flags.出口) && x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.压力));
                    if (monitorPr != null)
                    {
                        var signalPr = monitorPr.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.压力);
                        vm.Prk = new BigScreenAllStationListKpiItemDto()
                        {
                            Name = "出口压力",
                            Value = null,
                            UnitName = signalPr.GetDisplayUnitName()
                        };
                        var recordPr = service_monitor_record.Value.GetLastRecord(signalPr.ID);
                        if (recordPr != null)
                        {
                            vm.Prk.Value = signalPr.GetDisplayValue(recordPr.DataValue);
                        }
                    }
                }
            }

            return vmList;
        }

        /// <summary>
        /// èŽ·å–所有泵站工单Kpi信息
        /// </summary>
        [Route("GetAllStationRepairKpiInfo@V1.0")]
        [HttpGet]
        public BigScreenAllStationRepairKpiDto GetAllStationRepairKpiInfo()
        {
            var vm = new BigScreenAllStationRepairKpiDto();
            vm.Cd = 10;
            vm.Cm = 235;
            vm.Cy = 1230;
            vm.Pending = 5;
            vm.Accepted = 5;
            vm.Progress = 35;
            vm.Checked = 680;
            return vm;
        }

        /// <summary>
        /// èŽ·å–所有泵站工单日统计（最近一月）
        /// </summary>
        [Route("GetAllStationRepairDayStatisticsInfo@V1.0")]
        [HttpGet]
        public List<BigScreenAllStationRepairDayCountDto> GetAllStationRepairDayStatisticsInfo()
        {
            var dtEnd = DateTime.Now.Date;
            var dtStart = dtEnd.AddMonths(-1);
            var vmList = new List<BigScreenAllStationRepairDayCountDto>();
            for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
            {
                var vm = new BigScreenAllStationRepairDayCountDto();
                vm.Day = dt;
                vm.Count = Yw.Untity.RandomHelper.Random(10, 100);
                vmList.Add(vm);
            }
            return vmList;
        }

        /// <summary>
        /// èŽ·å–所有泵站工单月统计（最近一年）
        /// </summary>
        [Route("GetAllStationRepairMonthStatisticsInfo@V1.0")]
        [HttpGet]
        public List<BigScreenAllStationRepairMonthCountDto> GetAllStationRepairMonthStatisticsInfo()
        {
            var dtNow = DateTime.Now;
            var dtEnd = new DateTime(dtNow.Year, dtNow.Month, 1);
            var dtStart = dtEnd.AddMonths(-11);
            var vmList = new List<BigScreenAllStationRepairMonthCountDto>();
            for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddMonths(1))
            {
                var vm = new BigScreenAllStationRepairMonthCountDto();
                vm.Year = dt.Year;
                vm.Month = dt.Month;
                vm.Count = Yw.Untity.RandomHelper.Random(100, 1000);
                vmList.Add(vm);
            }
            return vmList;
        }

        /// <summary>
        /// èŽ·å–所有泵站报警信息
        /// </summary>
        [Route("GetAllStationAlarmInfo@V1.0")]
        [HttpGet]
        public List<BigScreenAllStationAlarmItemDto> GetAllStationAlarmInfo()
        {
            var vmList = new List<BigScreenAllStationAlarmItemDto>();
            vmList.Add(new BigScreenAllStationAlarmItemDto()
            {
                ID = 1,
                Name = "金庭中腰泵站",
                Content = "1#机组出口压力过低，请关注状态变化"
            });
            vmList.Add(new BigScreenAllStationAlarmItemDto()
            {
                ID = 2,
                Name = "凯泉一体化加压泵站",
                Content = "2#瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenAllStationAlarmItemDto()
            {
                ID = 3,
                Name = "凯泉一体化加压泵站",
                Content = "2#瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenAllStationAlarmItemDto()
            {
                ID = 4,
                Name = "凯泉一体化加压泵站",
                Content = "2#瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenAllStationAlarmItemDto()
            {
                ID = 5,
                Name = "凯泉一体化加压泵站",
                Content = "2#瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenAllStationAlarmItemDto()
            {
                ID = 6,
                Name = "凯泉一体化加压泵站",
                Content = "2#瞬时流量数据异常，请检修"
            });
            return vmList;
        }

        #endregion


        #region å•ç«™

        /// <summary>
        /// èŽ·å–单泵站kpi信息
        /// </summary>
        [Route("GetSingleStationKpiInfo@V1.0")]
        [HttpGet]
        public BigScreenSingleStationKpiDto GetSingleStationKpiInfo([FromQuery][Required] StationIDInput input)
        {
            var vm = new BigScreenSingleStationKpiDto();

            var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
            var service_monitor_record = new Lazy<Yw.Service.MonitorRealRecord>(() => new Yw.Service.MonitorRealRecord());
            var service_equipment = new Lazy<Yw.Service.Equipment>(() => new Yw.Service.Equipment());
            var service_run_record = new Lazy<Yw.Service.RunRealRecord>(() => new Yw.Service.RunRealRecord());

            var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID, Yw.Monitor.eCronType.Real);
            if (allMonitorList != null && allMonitorList.Count > 0)
            {
                var monitorQ = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.瞬时流量));
                if (monitorQ != null)
                {
                    var signalQ = monitorQ.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.瞬时流量);
                    vm.Q = new BigScreenSingleStationKpiItemDto()
                    {
                        Name = "瞬时流量",
                        Value = null,
                        UnitName = signalQ.GetDisplayUnitName()
                    };
                    var recordQ = service_monitor_record.Value.GetLastRecord(signalQ.ID);
                    if (recordQ != null)
                    {
                        vm.Q.Value = signalQ.GetDisplayValue(recordQ.DataValue);
                    }
                }

                var monitorPr = allMonitorList.Find(x => x.Flags.Contains(Yw.Monitor.Flags.出口) && x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.压力));
                if (monitorPr != null)
                {
                    var signalPr = monitorPr.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.压力);
                    vm.Pr = new BigScreenSingleStationKpiItemDto()
                    {
                        Name = "出口压力",
                        Value = null,
                        UnitName = signalPr.GetDisplayUnitName()
                    };
                    var recordPr = service_monitor_record.Value.GetLastRecord(signalPr.ID);
                    if (recordPr != null)
                    {
                        vm.Pr.Value = signalPr.GetDisplayValue(recordPr.DataValue);
                    }
                }

                var monitorZD = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.浊度));
                if (monitorZD != null)
                {
                    var signalZD = monitorZD.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.浊度);
                    vm.ZD = new BigScreenSingleStationKpiItemDto()
                    {
                        Name = "浊度",
                        Value = null,
                        UnitName = signalZD.GetDisplayUnitName()
                    };
                    var recordZD = service_monitor_record.Value.GetLastRecord(signalZD.ID);
                    if (recordZD != null)
                    {
                        vm.ZD.Value = signalZD.GetDisplayValue(recordZD.DataValue);
                    }
                }

                var monitorYL = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.余氯));
                if (monitorYL != null)
                {
                    var signalYL = monitorYL.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.余氯);
                    vm.YL = new BigScreenSingleStationKpiItemDto()
                    {
                        Name = "余氯",
                        Value = null,
                        UnitName = signalYL.GetDisplayUnitName()
                    };
                    var recordYL = service_monitor_record.Value.GetLastRecord(signalYL.ID);
                    if (recordYL != null)
                    {
                        vm.YL.Value = signalYL.GetDisplayValue(recordYL.DataValue);
                    }
                }

            }

            var allEquipmentList = service_equipment.Value.GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
            allEquipmentList = allEquipmentList?.Where(x => x.Flags.Contains(IStation.Flags.机组)).ToList();
            if (allEquipmentList != null && allEquipmentList.Count > 0)
            {
                vm.RunList = new List<BigScreenSingleStationKpiRunItemDto>();
                foreach (var equipment in allEquipmentList)
                {
                    var vm_run = new BigScreenSingleStationKpiRunItemDto()
                    {
                        Name = equipment.Name,
                        RunStatus = 0
                    };
                    var run_record = service_run_record.Value.GetLastRecord(Yw.Assets.DataType.Equipment, equipment.ID);
                    if (run_record != null)
                    {
                        vm_run.RunStatus = run_record.RSa;
                    }
                    vm.RunList.Add(vm_run);
                }
            }

            return vm;
        }

        /// <summary>
        /// èŽ·å–单泵站指标信息
        /// </summary>
        [Route("GetSingleStationQuotaInfo@V1.0")]
        [HttpGet]
        public BigScreenSingleStationQuotaKpiDto GetSingleStationQuotaInfo([FromQuery][Required] StationIDInput input)
        {
            var vm = new BigScreenSingleStationQuotaKpiDto();
            vm.Ws = new List<BigScreenSingleStationQuotaItemDto>();
            vm.Ps = new List<BigScreenSingleStationQuotaItemDto>();

            var dtEnd = DateTime.Now.Date;
            var dtStart = dtEnd.AddMonths(-1);
            for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
            {
                vm.Ws.Add(new BigScreenSingleStationQuotaItemDto()
                {
                    Day = dt,
                    Value = RandomHelper.Random(1000, 10000).ToString(),
                    UnitName = "m³"
                });
                vm.Ps.Add(new BigScreenSingleStationQuotaItemDto()
                {
                    Day = dt,
                    Value = RandomHelper.Random(2000, 3000).ToString(),
                    UnitName = "kW‧h"
                });
            }
            return vm;
        }

        /// <summary>
        /// èŽ·å–单泵站机组项列表
        /// </summary>
        [Route("GetSingleStationEnginePumpItemList@V1.0")]
        [HttpGet]
        public List<BigScreenSingleStationEnginePumpListItemDto> GetSingleStationEnginePumpItemList([FromQuery][Required] StationIDInput input)
        {
            var service_equipment = new Yw.Service.Equipment();
            var allEnginePumpList = service_equipment.GetByBelongTypeAndBelongID(IStation.DataType.LogicSite, input.StationID);
            allEnginePumpList = allEnginePumpList?.Where(x => x.Flags.Contains(IStation.Flags.机组)).ToList();
            if (allEnginePumpList == null || allEnginePumpList.Count < 1)
            {
                return default;
            }

            var service_monitor_mapping = new Lazy<Yw.Service.EquipmentMonitorMapping>(() => new Yw.Service.EquipmentMonitorMapping());
            var service_monitor = new Lazy<Yw.Service.MonitorPoint>(() => new Yw.Service.MonitorPoint());
            var service_monitor_record = new Lazy<Yw.Service.MonitorRealRecord>(() => new Yw.Service.MonitorRealRecord());

            var vmList = new List<BigScreenSingleStationEnginePumpListItemDto>();
            foreach (var enginePump in allEnginePumpList)
            {
                var vm = new BigScreenSingleStationEnginePumpListItemDto();
                vm.ID = enginePump.ID;
                vm.Name = enginePump.Name;
                vmList.Add(vm);

                var allChildEquipmentList = service_equipment.GetChildAndSelfByID(enginePump.ID);
                if (allChildEquipmentList != null && allChildEquipmentList.Count > 0)
                {
                    var allChildEquipmentIds = allChildEquipmentList.Select(x => x.ID).Distinct().ToList();
                    var allMappingList = service_monitor_mapping.Value.GetByEquipmentIds(allChildEquipmentIds);
                    if (allMappingList != null && allMappingList.Count > 0)
                    {
                        var allMonitorIds = allMappingList.Select(x => x.MonitorPointID).Distinct().ToList();
                        var allMonitorList = service_monitor.Value.GetExSignalWithSignalTypeByIds(allMonitorIds);
                        if (allMonitorList != null && allMonitorList.Count > 0)
                        {
                            var monitorRs = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.运行状态));
                            if (monitorRs != null)
                            {
                                var signalRs = monitorRs.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.运行状态);
                                vm.Rs = new BigScreenSingleStationEnginePumpListKpiItemDto()
                                {
                                    Name = "状态",
                                    Value = null,
                                    UnitName = null
                                };
                                var recordRs = service_monitor_record.Value.GetLastRecord(signalRs.ID);
                                if (recordRs != null)
                                {
                                    vm.Rs.Value = recordRs.DataValue;
                                }
                            }

                            var monitorHz = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.频率));
                            if (monitorHz != null)
                            {
                                var signalHz = monitorHz.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.频率);
                                vm.Hz = new BigScreenSingleStationEnginePumpListKpiItemDto()
                                {
                                    Name = "频率",
                                    Value = null,
                                    UnitName = signalHz.GetDisplayUnitName()
                                };
                                var recordHz = service_monitor_record.Value.GetLastRecord(signalHz.ID);
                                if (recordHz != null)
                                {
                                    vm.Hz.Value = signalHz.GetDisplayValue(recordHz.DataValue);
                                }
                            }

                            var monitorP = allMonitorList.Find(x => x.SignalList.Exists(t => t.SignalType.Code == Yw.Monitor.SignalType.有功功率));
                            if (monitorP != null)
                            {
                                var signalP = monitorP.SignalList.Find(x => x.SignalType.Code == Yw.Monitor.SignalType.有功功率);
                                vm.P = new BigScreenSingleStationEnginePumpListKpiItemDto()
                                {
                                    Name = "功率",
                                    Value = null,
                                    UnitName = signalP.GetDisplayUnitName()
                                };
                                var recordP = service_monitor_record.Value.GetLastRecord(signalP.ID);
                                if (recordP != null)
                                {
                                    vm.P.Value = signalP.GetDisplayValue(recordP.DataValue);
                                }
                            }

                        }
                    }
                }
            }

            return vmList;
        }

        /// <summary>
        /// èŽ·å–单泵站工单Kpi信息
        /// </summary>
        [Route("GetSingleStationRepairKpiInfo@V1.0")]
        [HttpGet]
        public BigScreenSingleStationRepairKpiDto GetSingleStationRepairKpiInfo([FromQuery][Required] StationIDInput input)
        {
            var vm = new BigScreenSingleStationRepairKpiDto();
            vm.Cd = 10;
            vm.Cm = 235;
            vm.Cy = 1230;
            vm.Pending = 5;
            vm.Accepted = 5;
            vm.Progress = 35;
            vm.Checked = 680;
            return vm;
        }

        /// <summary>
        /// èŽ·å–单泵站工单统计信息
        /// </summary>
        [Route("GetSingleStationRepairStatisticsInfo@V1.0")]
        [HttpGet]
        public BigScreenSingleStationRepairStatisticsInfoDto GetSingleStationRepairStatisticsInfo([FromQuery][Required] StationIDInput input)
        {
            var vm = new BigScreenSingleStationRepairStatisticsInfoDto();
            vm.LastMonth = new List<BigScreenSingleStationRepairDayCountDto>();

            var dtEnd = DateTime.Now.Date;
            var dtStart = dtEnd.AddMonths(-1);
            for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddDays(1))
            {
                var vm_day = new BigScreenSingleStationRepairDayCountDto();
                vm_day.Day = dt;
                vm_day.Count = Yw.Untity.RandomHelper.Random(10, 100);
                vm.LastMonth.Add(vm_day);
            }

            vm.LastYear = new List<BigScreenSingleStationRepairMonthCountDto>();
            var dtNow = DateTime.Now;
            dtEnd = new DateTime(dtNow.Year, dtNow.Month, 1);
            dtStart = dtEnd.AddMonths(-11);
            for (DateTime dt = dtStart; dt <= dtEnd; dt = dt.AddMonths(1))
            {
                var vm_month = new BigScreenSingleStationRepairMonthCountDto();
                vm_month.Year = dt.Year;
                vm_month.Month = dt.Month;
                vm_month.Count = Yw.Untity.RandomHelper.Random(100, 1000);
                vm.LastYear.Add(vm_month);
            }
            return vm;
        }

        /// <summary>
        /// èŽ·å–单泵站机组工单统计信息
        /// </summary>
        [Route("GetSingleStationRepairEnginePumpStatisticsInfo@V1.0")]
        [HttpGet]
        public BigScreenSingleStationRepairEnginePumpStatisticsInfoDto GetSingleStationRepairEnginePumpStatisticsInfo([FromQuery][Required] StationIDInput input)
        {
            var vm = new BigScreenSingleStationRepairEnginePumpStatisticsInfoDto();
            vm.Cd = new List<BigScreenSingleStationRepairEnginePumpCountDto>()
            {
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="1#机组",Count=1},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="2#机组",Count=3},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="3#机组",Count=0},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="4#机组",Count=1}
            };
            vm.Cm = new List<BigScreenSingleStationRepairEnginePumpCountDto>()
            {
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="1#机组",Count=10},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="2#机组",Count=32},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="3#机组",Count=4},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="4#机组",Count=18}
            };
            vm.Cm = new List<BigScreenSingleStationRepairEnginePumpCountDto>()
            {
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="1#机组",Count=123},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="2#机组",Count=45},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="3#机组",Count=8},
                new BigScreenSingleStationRepairEnginePumpCountDto(){ Name="4#机组",Count=23}
            };
            return vm;
        }

        /// <summary>
        /// èŽ·å–单泵站报警信息
        /// </summary>
        [Route("GetSingleStationAlarmInfo@V1.0")]
        [HttpGet]
        public List<BigScreenSingleStationAlarmItemDto> GetSingleStationAlarmInfo([FromQuery][Required] StationIDInput input)
        {
            var vmList = new List<BigScreenSingleStationAlarmItemDto>();
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 1,
                Name = "1#机组",
                Content = "出口压力过低，请关注状态变化"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 2,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 3,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 4,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 5,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            vmList.Add(new BigScreenSingleStationAlarmItemDto()
            {
                ID = 6,
                Name = "2#机组",
                Content = "瞬时流量数据异常，请检修"
            });
            return vmList;
        }

        #endregion

    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-alarm/BigScreenAllStationAlarmItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// æ³µç«™æŠ¥è­¦é¡¹
    /// </summary>
    public class BigScreenAllStationAlarmItemDto
    {
        /// <summary>
        /// id
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å†…容
        /// </summary>
        public string Content { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// æ³µç«™åˆ—表项
    /// </summary>
    public class BigScreenAllStationListItemDto
    {
        /// <summary>
        /// id
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// æµé‡
        /// </summary>
        public BigScreenAllStationListKpiItemDto Qk { get; set; }

        /// <summary>
        /// åŽ‹åŠ›
        /// </summary>
        public BigScreenAllStationListKpiItemDto Prk { get; set; }

    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-list/BigScreenAllStationListKpiItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenAllStationListKpiItemDto
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å€¼
        /// </summary>
        public string Value { get; set; }

        /// <summary>
        /// å•ä½
        /// </summary>
        public string UnitName { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairDayCountDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenAllStationRepairDayCountDto
    {
        /// <summary>
        /// æ—¥æœŸ
        /// </summary>
        public DateTime Day { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int Count { get; set; }


    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair-statistics/BigScreenAllStationRepairMonthCountDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenAllStationRepairMonthCountDto
    {
        /// <summary>
        /// å¹´ä»½
        /// </summary>
        public int Year { get; set; }

        /// <summary>
        /// æœˆä»½
        /// </summary>
        public int Month { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int Count { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station-repair/BigScreenAllStationRepairKpiDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenAllStationRepairKpiDto
    {
        /// <summary>
        /// å½“日数量
        /// </summary>
        public int Cd { get; set; }

        /// <summary>
        /// å½“月数量
        /// </summary>
        public int Cm { get; set; }

        /// <summary>
        /// å½“年数量
        /// </summary>
        public int Cy { get; set; }

        /// <summary>
        /// å¾…受理
        /// </summary>
        public int Pending { get; set; }

        /// <summary>
        /// å·²å—理
        /// </summary>
        public int Accepted { get; set; }

        /// <summary>
        /// è¿›è¡Œä¸­
        /// </summary>
        public int Progress { get; set; }

        /// <summary>
        /// å·²éªŒæ”¶
        /// </summary>
        public int Checked { get; set; }

    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenAllStationKpiDto
    {
        /// <summary>
        /// å½“日累计供水量
        /// </summary>
        public BigScreenAllStationKpiItemDto Lws { get; set; }

        /// <summary>
        /// å½“日累计用电量
        /// </summary>
        public BigScreenAllStationKpiItemDto Lps { get; set; }

        /// <summary>
        /// å½“前瞬时总流量
        /// </summary>
        public BigScreenAllStationKpiItemDto Sws { get; set; }

        /// <summary>
        /// å½“前瞬时总功率
        /// </summary>
        public BigScreenAllStationKpiItemDto Sps { get; set; }

        /// <summary>
        /// æ€»æ³µç«™æ•°é‡
        /// </summary>
        public BigScreenAllStationKpiItemDto Tsc { get; set; }

        /// <summary>
        /// è¿è¡Œæ³µç«™æ•°é‡
        /// </summary>
        public BigScreenAllStationKpiItemDto Rsc { get; set; }

        /// <summary>
        /// æ€»æœºç»„数量
        /// </summary>
        public BigScreenAllStationKpiItemDto Tpc { get; set; }

        /// <summary>
        /// è¿è¡Œæœºç»„数量
        /// </summary>
        public BigScreenAllStationKpiItemDto Rpc { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/all-station/BigScreenAllStationKpiItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// æ‰€æœ‰æ³µç«™kpi项 dto
    /// </summary>
    public class BigScreenAllStationKpiItemDto
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å€¼
        /// </summary>
        public string Value { get; set; }

        /// <summary>
        /// å•ä½
        /// </summary>
        public string UnitName { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-alarm/BigScreenSingleStationAlarmItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// æ³µç«™æŠ¥è­¦é¡¹
    /// </summary>
    public class BigScreenSingleStationAlarmItemDto
    {
        /// <summary>
        /// id
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å†…容
        /// </summary>
        public string Content { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// æ³µç«™åˆ—表项
    /// </summary>
    public class BigScreenSingleStationEnginePumpListItemDto
    {
        /// <summary>
        /// id
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// çŠ¶æ€
        /// </summary>
        public BigScreenSingleStationEnginePumpListKpiItemDto Rs { get; set; }

        /// <summary>
        /// é¢‘率
        /// </summary>
        public BigScreenSingleStationEnginePumpListKpiItemDto Hz { get; set; }

        /// <summary>
        /// åŠŸçŽ‡
        /// </summary>
        public BigScreenSingleStationEnginePumpListKpiItemDto P { get; set; }


    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-engine-pump-list/BigScreenSingleStationEnginePumpListKpiItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationEnginePumpListKpiItemDto
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å€¼
        /// </summary>
        public string Value { get; set; }

        /// <summary>
        /// å•ä½
        /// </summary>
        public string UnitName { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationQuotaItemDto
    {

        /// <summary>
        /// æ—¥æœŸ
        /// </summary>
        public DateTime Day { get; set; }

        /// <summary>
        /// æ—¥æœŸ
        /// </summary>
        public string Value { get; set; }

        /// <summary>
        /// å•ä½
        /// </summary>
        public string UnitName { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-quota/BigScreenSingleStationQuotaKpiDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationQuotaKpiDto
    {
        /// <summary>
        /// ä¾›æ°´é‡
        /// </summary>
        public List<BigScreenSingleStationQuotaItemDto> Ws { get; set; }

        /// <summary>
        /// ç”¨ç”µé‡
        /// </summary>
        public List<BigScreenSingleStationQuotaItemDto> Ps { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairDayCountDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationRepairDayCountDto
    {
        /// <summary>
        /// æ—¥æœŸ
        /// </summary>
        public DateTime Day { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int Count { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpCountDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationRepairEnginePumpCountDto
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int Count { get; set; }


    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairEnginePumpStatisticsInfoDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationRepairEnginePumpStatisticsInfoDto
    {
        /// <summary>
        /// å½“æ—¥
        /// </summary>
        public List<BigScreenSingleStationRepairEnginePumpCountDto> Cd { get; set; }

        /// <summary>
        /// å½“月
        /// </summary>
        public List<BigScreenSingleStationRepairEnginePumpCountDto> Cm { get; set; }

        /// <summary>
        /// å½“å¹´
        /// </summary>
        public List<BigScreenSingleStationRepairEnginePumpCountDto> Cy { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairMonthCountDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationRepairMonthCountDto
    {
        /// <summary>
        /// å¹´ä»½
        /// </summary>
        public int Year { get; set; }

        /// <summary>
        /// æœˆä»½
        /// </summary>
        public int Month { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int Count { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair-statistics/BigScreenSingleStationRepairStatisticsInfoDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationRepairStatisticsInfoDto
    {
        /// <summary>
        /// æœ€è¿‘一月
        /// </summary>
        public List<BigScreenSingleStationRepairDayCountDto> LastMonth { get; set; }

        /// <summary>
        /// æœ€è¿‘一年
        /// </summary>
        public List<BigScreenSingleStationRepairMonthCountDto> LastYear { get; set; }

    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station-repair/BigScreenSingleStationRepairKpiDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationRepairKpiDto
    {
        /// <summary>
        /// å½“日数量
        /// </summary>
        public int Cd { get; set; }

        /// <summary>
        /// å½“月数量
        /// </summary>
        public int Cm { get; set; }

        /// <summary>
        /// å½“年数量
        /// </summary>
        public int Cy { get; set; }

        /// <summary>
        /// å¾…受理
        /// </summary>
        public int Pending { get; set; }

        /// <summary>
        /// å·²å—理
        /// </summary>
        public int Accepted { get; set; }

        /// <summary>
        /// è¿›è¡Œä¸­
        /// </summary>
        public int Progress { get; set; }

        /// <summary>
        /// å·²éªŒæ”¶
        /// </summary>
        public int Checked { get; set; }

    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationKpiDto
    {
        /// <summary>
        /// çž¬æ—¶æµé‡
        /// </summary>
        public BigScreenSingleStationKpiItemDto Q { get; set; }

        /// <summary>
        /// å‡ºå£åŽ‹åŠ›
        /// </summary>
        public BigScreenSingleStationKpiItemDto Pr { get; set; }

        /// <summary>
        /// æµŠåº¦
        /// </summary>
        public BigScreenSingleStationKpiItemDto ZD { get; set; }

        /// <summary>
        /// ä½™æ°¯
        /// </summary>
        public BigScreenSingleStationKpiItemDto YL { get; set; }

        /// <summary>
        /// è¿è¡Œåˆ—表
        /// </summary>
        public List<BigScreenSingleStationKpiRunItemDto> RunList { get; set; }


    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// å•æ³µç«™kpi项 dto
    /// </summary>
    public class BigScreenSingleStationKpiItemDto
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// å€¼
        /// </summary>
        public string Value { get; set; }

        /// <summary>
        /// å•ä½
        /// </summary>
        public string UnitName { get; set; }
    }
}

 IStation.Application.SZJT/99-logic/11-big-screen/dto/single-station/BigScreenSingleStationKpiRunItemDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
namespace IStation.Application.SZJT
{
    /// <summary>
    /// 
    /// </summary>
    public class BigScreenSingleStationKpiRunItemDto
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// è¿è¡ŒçŠ¶æ€ 0-停机 1-开机
        /// </summary>
        public int RunStatus { get; set; }
    }
}

 IStation.Application.SZJT/GlobalUsings.cs

@@ -13,3 +13,4 @@
global using Yw.Service.Monitor;
global using IStation.Application.SZJT;
global using Microsoft.AspNetCore.Authorization;
global using Yw.Dto;

 IStation.Application.SZJT/IStation.Application.SZJT.csproj

@@ -31,13 +31,11 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="1.3.9" />
    <PackageReference Include="Yw.Service.Assets.Core" Version="1.2.9" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="1.0.5" />
    <PackageReference Include="Yw.Service.Map.Core" Version="1.0.4" />
    <PackageReference Include="Yw.Service.Monitor.Core" Version="2.1.5" />
    <PackageReference Include="Yw.Service.Repair.Core" Version="1.0.2" />
    <PackageReference Include="Yw.Service.Run.Core" Version="1.0.4" />
    <PackageReference Include="Yw.Application.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.DMA.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.Map.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Service.Repair.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
  </ItemGroup>

  <ItemGroup>

 IStation.Entry.SZJT/IStation.Entry.SZJT.csproj

@@ -13,17 +13,17 @@
  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

  <ItemGroup>
    <PackageReference Include="Yw.Application.ArtImage.Core" Version="1.1.4" />
    <PackageReference Include="Yw.Application.Assets.Core" Version="2.0.5" />
    <PackageReference Include="Yw.Application.Basic.Core" Version="1.2.8" />
    <PackageReference Include="Yw.Application.Bimface.Core" Version="1.0.5" />
    <PackageReference Include="Yw.Application.Dict.Core" Version="1.1.6" />
    <PackageReference Include="Yw.Application.DMA.Core" Version="1.0.6" />
    <PackageReference Include="Yw.Application.DOCS.Core" Version="1.0.2" />
    <PackageReference Include="Yw.Application.Map.Core" Version="1.0.5" />
    <PackageReference Include="Yw.Application.Monitor.Core" Version="2.2.3" />
    <PackageReference Include="Yw.Application.Repair.Core" Version="1.0.3" />
    <PackageReference Include="Yw.Application.Unit.Core" Version="1.1.7" />
    <PackageReference Include="Yw.Application.ArtImage.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.Assets.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Application.Basic.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Application.Bimface.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.Dict.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.DMA.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.DOCS.Core" Version="3.0.2" />
    <PackageReference Include="Yw.Application.Map.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Application.Monitor.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Application.Repair.Core" Version="3.0.1" />
    <PackageReference Include="Yw.Application.Unit.Core" Version="3.0.2" />
  </ItemGroup>

  <ItemGroup>

 IStation.Entry.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,6 +5,6 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\WorkData\git\istation\szjt\IStation.Entry.SZJT\bin\Release\net6.0\publish\</_PublishTargetUrl>
    <History>True|2024-01-27T03:33:20.6165535Z;True|2024-01-18T15:02:34.3492480+08:00;True|2024-01-15T18:07:28.9717635+08:00;True|2024-01-13T18:33:12.9427731+08:00;True|2024-01-03T12:04:02.7753609+08:00;True|2024-01-03T11:08:38.0680764+08:00;True|2024-01-03T10:52:12.8371853+08:00;True|2024-01-03T10:03:29.0482464+08:00;True|2023-12-28T09:09:43.7988141+08:00;True|2023-12-26T11:51:52.4664582+08:00;True|2023-12-26T10:49:59.5124896+08:00;True|2023-12-26T10:10:53.5396234+08:00;True|2023-12-25T15:30:59.3409132+08:00;True|2023-12-25T15:26:43.1943347+08:00;True|2023-12-25T10:08:29.7964560+08:00;True|2023-12-21T10:30:55.0589855+08:00;True|2023-12-19T21:25:45.9098277+08:00;True|2023-12-16T12:52:46.7024463+08:00;True|2023-12-14T16:16:02.6188884+08:00;True|2023-12-14T16:03:53.1458158+08:00;True|2023-12-14T15:59:33.3947428+08:00;True|2023-12-14T15:53:09.8869780+08:00;True|2023-12-14T14:17:07.2707485+08:00;True|2023-12-14T11:49:15.9699053+08:00;False|2023-12-14T11:48:41.4121185+08:00;True|2023-12-13T17:28:38.2180193+08:00;True|2023-12-13T14:47:22.2493536+08:00;True|2023-12-13T14:31:45.6098784+08:00;True|2023-12-13T14:05:08.5014675+08:00;True|2023-12-13T14:01:37.7165974+08:00;True|2023-12-13T13:50:57.4832531+08:00;True|2023-12-13T13:20:55.2902900+08:00;True|2023-12-13T12:01:09.6397101+08:00;True|2023-12-13T11:53:51.3171154+08:00;True|2023-12-13T11:18:29.2505125+08:00;True|2023-12-13T09:48:22.2436154+08:00;True|2023-12-12T11:49:25.2723311+08:00;True|2023-12-11T14:05:58.1086840+08:00;True|2023-12-11T09:31:35.0365077+08:00;True|2023-12-05T18:00:29.7005601+08:00;True|2023-12-05T17:35:46.7846869+08:00;True|2023-12-05T17:29:36.5936716+08:00;True|2023-12-04T19:50:38.7216121+08:00;True|2023-12-02T14:06:28.8643257+08:00;True|2023-11-30T16:54:56.0879009+08:00;True|2023-11-30T15:49:27.5213126+08:00;True|2023-11-30T13:42:14.9061099+08:00;False|2023-11-30T13:41:50.2796105+08:00;False|2023-11-30T13:41:42.4700953+08:00;True|2023-11-30T10:23:50.6226599+08:00;True|2023-11-30T09:22:54.2133326+08:00;True|2023-11-29T16:32:53.3651373+08:00;True|2023-11-29T09:19:39.1127566+08:00;True|2023-11-28T17:25:14.9642204+08:00;True|2023-11-28T16:53:30.7550754+08:00;True|2023-11-28T09:57:02.3264015+08:00;True|2023-11-27T14:26:33.6153027+08:00;True|2023-11-27T13:33:46.1964012+08:00;True|2023-11-27T13:21:38.2133314+08:00;True|2023-11-24T14:12:06.2053905+08:00;True|2023-11-23T15:38:30.0872291+08:00;True|2023-11-15T19:27:36.4861114+08:00;True|2023-11-15T14:16:33.6004541+08:00;True|2023-11-15T14:02:06.1224051+08:00;True|2023-11-15T09:35:35.1770813+08:00;True|2023-11-10T14:06:46.1528992+08:00;True|2023-11-08T14:07:13.3792249+08:00;True|2023-11-08T13:58:21.2455396+08:00;True|2023-11-08T13:34:05.8131818+08:00;True|2023-11-08T11:58:01.9187650+08:00;True|2023-11-07T14:11:15.6278203+08:00;True|2023-11-07T14:05:43.3330586+08:00;True|2023-10-27T08:30:17.2959726+08:00;True|2023-10-27T08:23:59.8360129+08:00;True|2023-10-25T20:36:54.7517897+08:00;True|2023-10-24T23:27:01.1980187+08:00;True|2023-10-24T22:57:21.3872591+08:00;True|2023-10-17T09:26:15.4157626+08:00;True|2023-10-16T16:44:05.1411215+08:00;True|2023-10-10T14:24:00.3649304+08:00;True|2023-10-10T14:12:16.4050462+08:00;True|2023-10-10T13:43:17.4397783+08:00;True|2023-10-08T16:16:16.4721892+08:00;True|2023-10-08T14:27:40.6092129+08:00;True|2023-10-08T13:36:44.2969175+08:00;True|2023-10-08T13:21:21.1105671+08:00;True|2023-10-08T11:41:25.6876188+08:00;True|2023-10-08T09:39:46.1146411+08:00;True|2023-09-26T14:26:57.6168193+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
    <History>True|2024-04-04T03:28:14.8768964Z;True|2024-04-04T09:39:21.6552156+08:00;True|2024-03-11T16:36:41.1901368+08:00;True|2024-01-27T11:33:20.6165535+08:00;True|2024-01-18T15:02:34.3492480+08:00;True|2024-01-15T18:07:28.9717635+08:00;True|2024-01-13T18:33:12.9427731+08:00;True|2024-01-03T12:04:02.7753609+08:00;True|2024-01-03T11:08:38.0680764+08:00;True|2024-01-03T10:52:12.8371853+08:00;True|2024-01-03T10:03:29.0482464+08:00;True|2023-12-28T09:09:43.7988141+08:00;True|2023-12-26T11:51:52.4664582+08:00;True|2023-12-26T10:49:59.5124896+08:00;True|2023-12-26T10:10:53.5396234+08:00;True|2023-12-25T15:30:59.3409132+08:00;True|2023-12-25T15:26:43.1943347+08:00;True|2023-12-25T10:08:29.7964560+08:00;True|2023-12-21T10:30:55.0589855+08:00;True|2023-12-19T21:25:45.9098277+08:00;True|2023-12-16T12:52:46.7024463+08:00;True|2023-12-14T16:16:02.6188884+08:00;True|2023-12-14T16:03:53.1458158+08:00;True|2023-12-14T15:59:33.3947428+08:00;True|2023-12-14T15:53:09.8869780+08:00;True|2023-12-14T14:17:07.2707485+08:00;True|2023-12-14T11:49:15.9699053+08:00;False|2023-12-14T11:48:41.4121185+08:00;True|2023-12-13T17:28:38.2180193+08:00;True|2023-12-13T14:47:22.2493536+08:00;True|2023-12-13T14:31:45.6098784+08:00;True|2023-12-13T14:05:08.5014675+08:00;True|2023-12-13T14:01:37.7165974+08:00;True|2023-12-13T13:50:57.4832531+08:00;True|2023-12-13T13:20:55.2902900+08:00;True|2023-12-13T12:01:09.6397101+08:00;True|2023-12-13T11:53:51.3171154+08:00;True|2023-12-13T11:18:29.2505125+08:00;True|2023-12-13T09:48:22.2436154+08:00;True|2023-12-12T11:49:25.2723311+08:00;True|2023-12-11T14:05:58.1086840+08:00;True|2023-12-11T09:31:35.0365077+08:00;True|2023-12-05T18:00:29.7005601+08:00;True|2023-12-05T17:35:46.7846869+08:00;True|2023-12-05T17:29:36.5936716+08:00;True|2023-12-04T19:50:38.7216121+08:00;True|2023-12-02T14:06:28.8643257+08:00;True|2023-11-30T16:54:56.0879009+08:00;True|2023-11-30T15:49:27.5213126+08:00;True|2023-11-30T13:42:14.9061099+08:00;False|2023-11-30T13:41:50.2796105+08:00;False|2023-11-30T13:41:42.4700953+08:00;True|2023-11-30T10:23:50.6226599+08:00;True|2023-11-30T09:22:54.2133326+08:00;True|2023-11-29T16:32:53.3651373+08:00;True|2023-11-29T09:19:39.1127566+08:00;True|2023-11-28T17:25:14.9642204+08:00;True|2023-11-28T16:53:30.7550754+08:00;True|2023-11-28T09:57:02.3264015+08:00;True|2023-11-27T14:26:33.6153027+08:00;True|2023-11-27T13:33:46.1964012+08:00;True|2023-11-27T13:21:38.2133314+08:00;True|2023-11-24T14:12:06.2053905+08:00;True|2023-11-23T15:38:30.0872291+08:00;True|2023-11-15T19:27:36.4861114+08:00;True|2023-11-15T14:16:33.6004541+08:00;True|2023-11-15T14:02:06.1224051+08:00;True|2023-11-15T09:35:35.1770813+08:00;True|2023-11-10T14:06:46.1528992+08:00;True|2023-11-08T14:07:13.3792249+08:00;True|2023-11-08T13:58:21.2455396+08:00;True|2023-11-08T13:34:05.8131818+08:00;True|2023-11-08T11:58:01.9187650+08:00;True|2023-11-07T14:11:15.6278203+08:00;True|2023-11-07T14:05:43.3330586+08:00;True|2023-10-27T08:30:17.2959726+08:00;True|2023-10-27T08:23:59.8360129+08:00;True|2023-10-25T20:36:54.7517897+08:00;True|2023-10-24T23:27:01.1980187+08:00;True|2023-10-24T22:57:21.3872591+08:00;True|2023-10-17T09:26:15.4157626+08:00;True|2023-10-16T16:44:05.1411215+08:00;True|2023-10-10T14:24:00.3649304+08:00;True|2023-10-10T14:12:16.4050462+08:00;True|2023-10-10T13:43:17.4397783+08:00;True|2023-10-08T16:16:16.4721892+08:00;True|2023-10-08T14:27:40.6092129+08:00;True|2023-10-08T13:36:44.2969175+08:00;True|2023-10-08T13:21:21.1105671+08:00;True|2023-10-08T11:41:25.6876188+08:00;True|2023-10-08T09:39:46.1146411+08:00;True|2023-09-26T14:26:57.6168193+08:00;True|2023-09-21T13:54:19.1780900+08:00;True|2023-09-21T13:16:00.2957740+08:00;True|2023-09-21T11:28:36.3091944+08:00;True|2023-09-21T11:18:20.1060798+08:00;True|2023-09-13T16:00:49.4080881+08:00;True|2023-09-11T13:53:38.8582724+08:00;True|2023-09-01T10:32:37.4923361+08:00;True|2023-08-30T16:52:43.1952609+08:00;True|2023-08-30T13:41:35.0430741+08:00;True|2023-08-28T14:53:24.2454140+08:00;True|2023-08-28T13:50:55.9362462+08:00;True|2023-08-28T10:00:17.0366755+08:00;True|2023-08-25T15:41:23.8727088+08:00;True|2023-08-24T16:47:54.1391198+08:00;True|2023-08-24T16:40:29.0473991+08:00;True|2023-08-22T15:02:27.5312918+08:00;True|2023-08-22T11:18:43.6918732+08:00;True|2023-08-21T15:10:42.9223597+08:00;True|2023-08-21T14:21:08.1887373+08:00;True|2023-08-21T11:56:07.5304445+08:00;True|2023-08-18T16:57:57.0506312+08:00;True|2023-08-18T13:51:54.9145260+08:00;True|2023-08-17T14:52:44.6557301+08:00;True|2023-08-17T14:15:19.8255432+08:00;True|2023-08-17T14:03:01.1586247+08:00;True|2023-08-17T11:46:51.6685579+08:00;True|2023-08-16T11:12:27.1684542+08:00;True|2023-08-15T16:59:09.4901359+08:00;True|2023-08-10T14:08:04.8032876+08:00;True|2023-08-10T13:55:01.9698355+08:00;True|2023-08-10T10:43:44.0440039+08:00;True|2023-08-10T10:12:03.9359243+08:00;True|2023-08-09T15:07:46.6906781+08:00;True|2023-08-09T13:12:06.7912004+08:00;True|2023-08-09T10:23:24.5864225+08:00;True|2023-08-08T17:38:10.4753030+08:00;True|2023-08-08T12:56:08.9783211+08:00;True|2023-08-06T09:18:33.3703637+08:00;True|2023-08-03T11:01:58.9814864+08:00;True|2023-08-03T10:26:08.4681748+08:00;True|2023-08-02T20:33:35.0425049+08:00;True|2023-08-02T17:31:18.4675932+08:00;True|2023-08-02T16:04:16.8761862+08:00;True|2023-08-02T13:48:38.9129192+08:00;True|2023-08-02T13:45:00.6546267+08:00;True|2023-08-01T15:26:25.0389689+08:00;True|2023-08-01T14:08:10.9121758+08:00;True|2023-07-31T13:35:10.1220213+08:00;True|2023-07-31T09:20:11.2607880+08:00;True|2023-07-28T13:44:35.4317136+08:00;True|2023-07-27T10:40:46.5453757+08:00;True|2023-07-27T09:16:57.7421426+08:00;True|2023-07-26T17:10:56.0976913+08:00;True|2023-07-26T12:01:33.5766311+08:00;True|2023-07-25T18:07:38.5726960+08:00;True|2023-07-25T17:42:39.3625959+08:00;True|2023-07-25T17:04:09.8723273+08:00;True|2023-07-25T16:28:14.1819137+08:00;True|2023-07-24T14:11:28.2113907+08:00;True|2023-07-24T12:05:09.0376032+08:00;True|2023-07-24T09:36:39.6541522+08:00;True|2023-07-19T12:25:56.9887829+08:00;True|2023-07-17T13:00:04.0123733+08:00;True|2023-07-13T12:13:14.7927242+08:00;True|2023-07-13T11:46:24.1368807+08:00;True|2023-07-13T10:24:33.1684712+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History>
  </PropertyGroup>
</Project>

 IStation.Server.SZJT/IStation.Server.SZJT.csproj

@@ -8,11 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Log4Net.Core" Version="1.0.0" />
    <PackageReference Include="Yw.Quartz.Core" Version="1.0.0" />
    <PackageReference Include="Yw.Service.Assets.Core" Version="1.1.5" />
    <PackageReference Include="Yw.Service.Monitor.Core" Version="1.4.0" />
    <PackageReference Include="Yw.Service.Run.Core" Version="1.0.2" />
    <PackageReference Include="Yw.Quartz.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Service.Run.Core" Version="3.0.1" />
  </ItemGroup>

  <ItemGroup>

 IStation.Service.SZJT/00-core/Catalog.cs

 IStation.Service.SZJT/00-core/ConfigHelper.cs

 IStation.Service.SZJT/00-core/DataType.cs

 IStation.Service.SZJT/00-core/Flags.cs

 IStation.Service.SZJT/00-core/MemoryCacheKey.cs

 IStation.Service.SZJT/01-entity/01-policy/LogicPolicy.cs

ÎļþÃû´Ó IStation.Service.SZJT/1-entity/1-policy/LogicPolicy.cs ÐÞ¸Ä
@@ -1,10 +1,11 @@
namespace IStation.Entity
using Yw.Entity;
namespace IStation.Entity
{
    /// <summary>
    /// ä¸šåŠ¡ç­–ç•¥
    /// </summary>
    [SugarTable("logic_policy")]
    public class LogicPolicy : Yw.Entity.BaseEntity, Yw.Entity.ICode, Yw.Entity.ISorter, Yw.Entity.IParas, Yw.Entity.IFlags, Yw.Entity.IUseStatus, Yw.Entity.ITagName, System.ICloneable
    public class LogicPolicy : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/01-entity/02-area/LogicArea.cs

ÎļþÃû´Ó IStation.Service.SZJT/1-entity/2-area/LogicArea.cs ÐÞ¸Ä
@@ -1,10 +1,11 @@
namespace IStation.Entity
using Yw.Entity;
namespace IStation.Entity
{
    /// <summary>
    /// ä¸šåŠ¡åŒºåŸŸ
    /// </summary>
    [SugarTable("logic_area")]
    public class LogicArea : Yw.Entity.BaseEntity, Yw.Entity.ISorter, Yw.Entity.ICode, Yw.Entity.IParas, Yw.Entity.IFlags, Yw.Entity.ITagName, Yw.Entity.IUseStatus, System.ICloneable
    public class LogicArea : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/01-entity/03-site/LogicSite.cs

ÎļþÃû´Ó IStation.Service.SZJT/1-entity/3-site/LogicSite.cs ÐÞ¸Ä
@@ -1,10 +1,11 @@
namespace IStation.Entity
using Yw.Entity;
namespace IStation.Entity
{
    /// <summary>
    /// ä¸šåŠ¡ç«™
    /// </summary>
    [SugarTable("logic_site")]
    public class LogicSite : Yw.Entity.BaseEntity, Yw.Entity.ICode, Yw.Entity.ISorter, Yw.Entity.IFlags, Yw.Entity.IParas, Yw.Entity.ITagName, Yw.Entity.IUseStatus, System.ICloneable
    public class LogicSite : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/01-entity/04-tree/LogicTree.cs

ÎļþÃû´Ó IStation.Service.SZJT/1-entity/4-tree/LogicTree.cs ÐÞ¸Ä
@@ -1,10 +1,11 @@
namespace IStation.Entity
using Yw.Entity;
namespace IStation.Entity
{
    /// <summary>
    /// ä¸šåŠ¡æ¸…单
    /// </summary>
    [SugarTable("logic_tree")]
    public class LogicTree : Yw.Entity.BaseEntity, Yw.Entity.ITreeSorter, System.ICloneable
    public class LogicTree : BaseEntity, ITreeSorter, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveItem.cs

 IStation.Service.SZJT/01-entity/04-tree/LogicTreeSaveTree.cs

 IStation.Service.SZJT/01-entity/05-dma/LogicDma.cs

ÎļþÃû´Ó IStation.Service.SZJT/1-entity/5-dma/LogicDma.cs ÐÞ¸Ä
@@ -1,10 +1,11 @@
namespace IStation.Entity
using Yw.Entity;
namespace IStation.Entity
{
    /// <summary>
    /// ä¸šåŠ¡dma
    /// </summary>
    [SugarTable("logic_dma")]
    public class LogicDma : Yw.Entity.BaseEntity, Yw.Entity.ICode, Yw.Entity.ISorter, Yw.Entity.IFlags, Yw.Entity.IParas, Yw.Entity.ITagName, Yw.Entity.IUseStatus, System.ICloneable
    public class LogicDma : BaseEntity, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/02-model/01-policy/LogicPolicy.cs

ÎļþÃû´Ó IStation.Service.SZJT/2-model/1-policy/LogicPolicy.cs ÐÞ¸Ä
@@ -1,9 +1,10 @@
namespace IStation.Model
using Yw.Model;
namespace IStation.Model
{
    /// <summary>
    /// ä¸šåŠ¡ç­–ç•¥
    /// </summary>
    public class LogicPolicy : Yw.Model.BaseModel, System.ICloneable
    public class LogicPolicy : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/02-model/02-area/LogicArea.cs

ÎļþÃû´Ó IStation.Service.SZJT/2-model/2-area/LogicArea.cs ÐÞ¸Ä
@@ -1,9 +1,10 @@
namespace IStation.Model
using Yw.Model;
namespace IStation.Model
{
    /// <summary>
    /// ä¸šåŠ¡åŒºåŸŸ
    /// </summary>
    public class LogicArea : Yw.Model.BaseModel, System.ICloneable
    public class LogicArea : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/02-model/03-site/LogicSite.cs

ÎļþÃû´Ó IStation.Service.SZJT/2-model/3-site/LogicSite.cs ÐÞ¸Ä
@@ -1,9 +1,10 @@
namespace IStation.Model
using Yw.Model;
namespace IStation.Model
{
    /// <summary>
    /// ä¸šåŠ¡ç«™
    /// </summary>    
    public partial class LogicSite : Yw.Model.BaseModel, System.ICloneable
    public partial class LogicSite : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/02-model/04-tree/LogicTree.cs

ÎļþÃû´Ó IStation.Service.SZJT/2-model/4-tree/LogicTree.cs ÐÞ¸Ä
@@ -1,9 +1,10 @@
namespace IStation.Model
using Yw.Model;
namespace IStation.Model
{
    /// <summary>
    /// ä¸šåŠ¡æ¸…单
    /// </summary>
    public class LogicTree : Yw.Model.BaseModel, System.ICloneable
    public class LogicTree : BaseModel, ITreeSorter, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/02-model/04-tree/LogicTreeEx.cs

ÎļþÃû´Ó IStation.Service.SZJT/2-model/4-tree/LogicTreeEx.cs ÐÞ¸Ä
@@ -1,4 +1,10 @@
namespace IStation.Model
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation.Model
{
    /// <summary>
    /// 

 IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveItem.cs

 IStation.Service.SZJT/02-model/04-tree/LogicTreeSaveTree.cs

 IStation.Service.SZJT/02-model/05-dma/LogicDma.cs

ÎļþÃû´Ó IStation.Service.SZJT/2-model/5-dma/LogicDma.cs ÐÞ¸Ä
@@ -1,9 +1,10 @@
namespace IStation.Model
using Yw.Model;
namespace IStation.Model
{
    /// <summary>
    /// ä¸šåŠ¡dma
    /// </summary>    
    public partial class LogicDma : Yw.Model.BaseModel, System.ICloneable
    public partial class LogicDma : BaseModel, ICode, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/03-settings/helper/SZJTFileHelper.cs

 IStation.Service.SZJT/03-settings/helper/SZJTParasHelper.cs

 IStation.Service.SZJT/03-settings/paras/Paras_SZJT.cs

 IStation.Service.SZJT/03-settings/paras/Paras_SZJT_DataBase.cs

 IStation.Service.SZJT/03-settings/paras/Paras_SZJT_Task.cs

 IStation.Service.SZJT/03-settings/paras/SZJTParas.cs

 IStation.Service.SZJT/04-dal/01-policy/LogicPolicy.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using Yw.DAL.PostgreSql;
namespace IStation.DAL
{
    /// <summary>
    /// 
    /// </summary>
    public partial class LogicPolicy : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicPolicy>
    {
        /// <summary>
        /// 
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return ConfigHelper.DefaultConnectionConfig; }
        }





    }
}

 IStation.Service.SZJT/04-dal/02-area/LogicArea.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
using Yw.DAL.PostgreSql;
namespace IStation.DAL
{
    /// <summary>
    /// 
    /// </summary>
    public partial class LogicArea : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicArea>
    {
        /// <summary>
        /// 
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return ConfigHelper.DefaultConnectionConfig; }
        }

        /// <summary>
        /// é€šè¿‡ PolicyID èŽ·å–
        /// </summary>
        public List<Entity.LogicArea> GetByPolicyID(long PolicyID)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Queryable<Entity.LogicArea>()
                    .Where(x => x.PolicyID == PolicyID)
                    .OrderBy(x => x.SortCode).ToList();
            }
        }




    }
}

 IStation.Service.SZJT/04-dal/03-site/LogicSite.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using Yw.DAL.PostgreSql;
namespace IStation.DAL
{
    /// <summary>
    /// 
    /// </summary>
    public partial class LogicSite : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicSite>
    {
        /// <summary>
        /// 
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return ConfigHelper.DefaultConnectionConfig; }
        }





    }
}

 IStation.Service.SZJT/04-dal/04-tree/LogicTree.cs

ÎļþÃû´Ó IStation.Service.SZJT/4-dal/4-tree/LogicTree.cs ÐÞ¸Ä
@@ -1,9 +1,10 @@
namespace IStation.DAL
using Yw.DAL.PostgreSql;
namespace IStation.DAL
{
    /// <summary>
    /// ä¸šåŠ¡æ¸…单
    /// </summary>
    public partial class LogicTree : Yw.DAL.BaseDAL_TreeSorter<Entity.LogicTree>
    public partial class LogicTree : BaseDAL_TreeSorter<Entity.LogicTree>
    {
        /// <summary>
        /// 

 IStation.Service.SZJT/04-dal/05-dma/LogicDma.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using Yw.DAL.PostgreSql;
namespace IStation.DAL
{
    /// <summary>
    /// 
    /// </summary>
    public partial class LogicDma : BaseDAL_Code_Paras_Flags_TagName_Sorter_UseStatus<Entity.LogicDma>
    {
        /// <summary>
        /// 
        /// </summary>
        public override ConnectionConfig ConnectionConfig
        {
            get { return ConfigHelper.DefaultConnectionConfig; }
        }





    }
}

 IStation.Service.SZJT/05-service/00-core/CacheHelper.cs

ÎļþÃû´Ó IStation.Service.SZJT/5-service/0-helper/CacheHelper.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@
    /// </summary>
    internal class CacheHelper
    {
        private const string _cacheKeyPrefix = "Phm";//缓存键前缀
        private const string _cacheKeyPrefix = "szjt";//缓存键前缀

        /// <summary>
        /// èŽ·å–缓存键

 IStation.Service.SZJT/05-service/00-core/Extensions.cs

 IStation.Service.SZJT/05-service/00-core/LogicHelper.cs

 IStation.Service.SZJT/05-service/01-policy/Cache/LogicPolicyCacheHelper.cs

 IStation.Service.SZJT/05-service/01-policy/LogicPolicy.cs

 IStation.Service.SZJT/05-service/01-policy/LogicPolicy_Instance.cs

 IStation.Service.SZJT/05-service/02-area/Cache/LogicAreaCacheHelper.cs

 IStation.Service.SZJT/05-service/02-area/LogicArea.cs

 IStation.Service.SZJT/05-service/02-area/LogicArea_Instance.cs

 IStation.Service.SZJT/05-service/03-site/Cache/LogicSiteCacheHelper.cs

 IStation.Service.SZJT/05-service/03-site/LogicSite.cs

 IStation.Service.SZJT/05-service/03-site/LogicSite_Instance.cs

 IStation.Service.SZJT/05-service/04-tree/Cache/LogicTreeCacheHelper.cs

 IStation.Service.SZJT/05-service/04-tree/LogicTree.cs

 IStation.Service.SZJT/05-service/04-tree/LogicTree_Instance.cs

 IStation.Service.SZJT/05-service/05-dma/Cache/LogicDmaCacheHelper.cs

 IStation.Service.SZJT/05-service/05-dma/LogicDma.cs

 IStation.Service.SZJT/05-service/05-dma/LogicDma_Instance.cs

 IStation.Service.SZJT/4-dal/1-policy/LogicPolicy.cs

ÎļþÒÑɾ³ý

 IStation.Service.SZJT/4-dal/2-area/LogicArea.cs

ÎļþÒÑɾ³ý

 IStation.Service.SZJT/4-dal/3-site/LogicSite.cs

ÎļþÒÑɾ³ý

 IStation.Service.SZJT/4-dal/5-dma/LogicDma.cs

ÎļþÒÑɾ³ý

 IStation.Service.SZJT/GlobalUsings.cs

@@ -7,7 +7,6 @@
global using System.Collections;
global using SqlSugar;
global using AutoMapper;
global using Yw.Newtonsoft;
global using Yw.Settings;
global using Yw.Untity;
global using Yw;

 IStation.Service.SZJT/IStation.Service.SZJT.csproj

@@ -38,7 +38,9 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Service.Basic.Core" Version="1.3.3" />
    <PackageReference Include="Yw.Service.Assets.Core" Version="3.0.5" />
    <PackageReference Include="Yw.Service.Basic.Core" Version="3.0.3" />
    <PackageReference Include="Yw.Service.Monitor.Core" Version="3.0.5" />
  </ItemGroup>

</Project>

 IStation.TopShelf.SZJT/IStation.TopShelf.SZJT.csproj

@@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.TopShelf" Version="1.0.0" />
    <PackageReference Include="Yw.TopShelf" Version="3.0.0" />
  </ItemGroup>

  <ItemGroup>

 IStation.TopShelf.SZJT/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,6 +4,6 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2023-12-26T02:39:19.5076776Z;True|2023-12-15T09:43:55.2219318+08:00;True|2023-11-29T15:11:51.9151157+08:00;True|2023-11-29T14:58:05.0127775+08:00;</History>
    <History>True|2024-04-04T01:42:40.4553718Z;True|2023-12-26T10:39:19.5076776+08:00;True|2023-12-15T09:43:55.2219318+08:00;True|2023-11-29T15:11:51.9151157+08:00;True|2023-11-29T14:58:05.0127775+08:00;</History>
  </PropertyGroup>
</Project>

 IStation.WebApi.SZJT/Handlers/JwtHandler.cs

@@ -1,6 +1,8 @@
using Furion.Authorization;
using Furion.DataEncryption;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;


namespace IStation.WebApi
{
@@ -10,6 +12,26 @@
    public class JwtHandler : AppAuthorizeHandler
    {
        /// <summary>
        /// è‡ªåŠ¨åˆ·æ–°Token
        /// </summary>
        /// <param name="context"></param>
        /// <returns></returns>
        public override async Task HandleAsync(AuthorizationHandlerContext context)
        {
            var accessTokenExpire = Yw.Settings.AuthParasHelper.Auth.JWT.AccessTokenExpire;
            var refreshTokenExpire = Yw.Settings.AuthParasHelper.Auth.JWT.RefreshTokenExpire;

            if (JWTEncryption.AutoRefreshToken(context, context.GetCurrentHttpContext(), accessTokenExpire, refreshTokenExpire))
            {
                await AuthorizeHandleAsync(context);
            }
            else
            {
                context.Fail(); // æŽˆæƒå¤±è´¥
            }
        }

        /// <summary>
        /// è¯·æ±‚管道
        /// </summary>
        /// <param name="context"></param>

 IStation.WebApi.SZJT/IStation.WebApi.SZJT.csproj

@@ -22,7 +22,8 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Knife4jUI.Core" Version="1.0.0" />
    <PackageReference Include="Yw.Knife4jUI.Core" Version="3.0.0" />
    <PackageReference Include="Yw.Service.Auth.Core" Version="3.0.2" />
  </ItemGroup>

  <ItemGroup>

 IStation.WebApi.SZJT/Result/XnRestfulResult.cs

ÎļþÒÑɾ³ý

 IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs

@@ -9,16 +9,16 @@
using System.Net;
using Yw.Untity;
using Yw.Application;
using Yw.Dto;

namespace IStation.WebApi
{
    /// <summary>
    /// è§„范化RESTful风格返回值
    /// </summary>
    [SuppressSniffer, UnifyModel(typeof(XnRestfulResult<>))]
    [SuppressSniffer, UnifyModel(typeof(Result<>))]
    public class XnRestfulResultProvider : IUnifyResultProvider
    {

        /// <summary>
        /// å¼‚常
        /// </summary>
@@ -27,14 +27,14 @@
            // è§£æžå¼‚常信息
            //var exceptionMetadata = UnifyContext.GetExceptionMetadata(context);

            XnRestfulResult<object> result = null;
            Result<object> result = null;

            //furion异常
            if (context.Exception is AppFriendlyException friendException)
            {
                result = new XnRestfulResult<object>
                result = new Result<object>
                {
                    Code = (int)eResultCode.Alert,
                    Code = eResultCode.Alert,
                    Error = friendException.ErrorCode,
                    Message = friendException.ErrorMessage,
                    Data = null,
@@ -44,9 +44,9 @@
            }

            //api异常
            else if (context.Exception is ApiException apiException)
            else if (context.Exception is InternalException apiException)
            {
                result = new XnRestfulResult<object>
                result = new Result<object>
                {
                    Code = apiException.ResultCode,
                    Error = apiException.ErrorCode,
@@ -59,9 +59,9 @@

            else
            {
                result = new XnRestfulResult<object>
                result = new Result<object>
                {
                    Code = (int)eResultCode.Error,
                    Code = eResultCode.Error,
                    Error = "系统异常",
                    Message = context.Exception.StackTrace,
                    Data = null,
@@ -70,9 +70,9 @@
                };
            }

            if (result.Code == (int)eResultCode.Error)
            if (result.Code == eResultCode.Error)
            {
                LogHelper.Error($"错误码：{result.Error}，错误信息：{result.Message}");
                Yw.LogHelper.Error($"错误码：{result.Error}，错误信息：{result.Message}");
            }

            return new JsonResult(result);
@@ -100,9 +100,9 @@
                    return null;
            }

            return new JsonResult(new XnRestfulResult<object>
            return new JsonResult(new Result<object>
            {
                Code = (int)eResultCode.Success,
                Code = eResultCode.Success,
                Error = null,
                Message = "请求成功",
                Data = data,
@@ -116,10 +116,10 @@
        /// </summary>
        public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
        {
            return new JsonResult(new XnRestfulResult<object>
            return new JsonResult(new Result<object>
            {
                Code = (int)eResultCode.Prompt,
                Error = ErrorCodes.V001.ToString(),
                Code = eResultCode.Prompt,
                Error = InternalErrorCodes.V001.ToString(),
                Message = metadata.Message,
                Data = null,
                Extras = UnifyContext.Take(),
@@ -137,10 +137,10 @@

            if (Enum.IsDefined(typeof(HttpStatusCode), (HttpStatusCode)statusCode))
            {
                await context.Response.WriteAsJsonAsync(new XnRestfulResult<object>
                await context.Response.WriteAsJsonAsync(new Result<object>
                {
                    Code = (int)eResultCode.Confirm,
                    Error = ErrorCodes.A099.ToString(),
                    Code = eResultCode.Confirm,
                    Error = InternalErrorCodes.A099.ToString(),
                    Message = "权限验证失败",
                    Data = null,
                    Extras = UnifyContext.Take(),