版本更新

hutongqing

2024-11-01 2f75b4c0a67ccc3a443e7cc4f2f0f909defd9a92

 WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs

@@ -41,12 +41,13 @@
            _deviceInfoRepository = deviceInfoRepository;
        }

        /// <summary>
        /// 查询调度服务Job与对应的设备信息。
        /// </summary>
        /// <returns>返回调度服务JobDTO集合。</returns>
        public List<DispatchInfoDTO> QueryDispatchInfos()
        {
            List<Dt_DispatchInfo> dispatchInfos = BaseDal.QueryData();
            List<Dt_DeviceInfo> deviceInfos = _deviceInfoRepository.QueryData();

            return Db.Queryable<Dt_DispatchInfo, Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType && b.DeviceStatus == ((int)DeviceStatusEnum.Enable).ToString()).Select((a, b) => new DispatchInfoDTO
            return Db.Queryable<Dt_DispatchInfo>().LeftJoin<Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType).Select((a, b) => new DispatchInfoDTO
            {
                JobGroup = a.JobGroup,
                AssemblyName = a.AssemblyName,
@@ -62,7 +63,8 @@
                ModifyDate = a.ModifyDate,
                Name = a.Name,
                Remark = a.Remark,
                DeviceStatus = b.DeviceType
                DeviceType = b.DeviceType,
                Enable = (b.DeviceStatus) ?? (((int)DeviceStatusEnum.Enable).ToString())
            }).ToList();
        }
    }