diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 457e190..64ef391 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -43,7 +43,7 @@ namespace BLL /// 数据库连接字符串 /// private static string connString; - + /// /// 数据库连结字符串。 /// @@ -134,7 +134,8 @@ namespace BLL { get { - lock (locker) { + lock (locker) + { try { if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId)) @@ -194,7 +195,7 @@ namespace BLL DDL.Items.Insert(0, new FineUIPro.ListItem("- 请选择 -", BLL.Const._Null)); return; } - + /// /// 为目标下拉框加上选择内容 /// @@ -575,7 +576,7 @@ namespace BLL Random rm = new Random(System.Environment.TickCount); if (dateTime.HasValue) { - str= dateTime.Value.ToString("yyyyMMddhhmmss") + rm.Next(1000, 9999).ToString(); + str = dateTime.Value.ToString("yyyyMMddhhmmss") + rm.Next(1000, 9999).ToString(); } return str; } @@ -872,7 +873,7 @@ namespace BLL } #region 获取大写金额事件 - public static string NumericCapitalization(decimal num) + public static string NumericCapitalization(decimal num) { string str1 = "零壹贰叁肆伍陆柒捌玖"; //0-9所对应的汉字 string str2 = "万仟佰拾亿仟佰拾万仟佰拾元角分"; //数字位所对应的汉字 @@ -1003,7 +1004,7 @@ namespace BLL return str.ToArray(); } - public static string GetStringByArray(string[] array) + public static string GetStringByArray(string[] array) { string str = string.Empty; foreach (var item in array) @@ -1209,6 +1210,7 @@ namespace BLL } IRestResponse response = client.Execute(request); + return response.Content; } diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index 958b46b..76d6a80 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -14,28 +14,6 @@ namespace BLL { private static Timer environmentTimer; - public static void StartEnvironmentSync() - { - ErrLogInfo.WriteLog("鍚敤鐜瀹氭椂鍣ㄥ紑濮!" ); - - if (environmentTimer != null) - { - environmentTimer.Stop(); - environmentTimer.Dispose(); - environmentTimer = null; - } - - environmentTimer = new Timer - { - AutoReset = true - }; - environmentTimer.Elapsed += new ElapsedEventHandler(EnvironmentProcess); - environmentTimer.Interval = 1000 * 60 * 10;// 60鍒嗛挓 60000 * adTimeJ; - environmentTimer.Start(); - ErrLogInfo.WriteLog("鍚敤鐜瀹氭椂鍣ㄧ粨鏉!"); - - } - private static void EnvironmentProcess(object sender, ElapsedEventArgs e) { try @@ -54,35 +32,6 @@ namespace BLL /// private static Timer messageTimer; - /// - /// 鍚姩鐩戣鍣,涓嶄竴瀹氳兘鎴愬姛锛屾牴鎹郴缁熻缃喅瀹氬鐩戣鍣ㄦ墽琛岀殑鎿嶄綔 绯荤粺鍚姩5鍒嗛挓 - /// - public static void StartMonitor() - { - //int adTimeJ = 60; - //if (adomain.AdTimeH.HasValue) - //{ - // adTimeJ += adomain.AdTimeH.Value * 60; - //} - //if (adomain.AdTimeM.HasValue) - //{ - // adTimeJ += adomain.AdTimeM.Value; - //} - if (messageTimer != null) - { - messageTimer.Stop(); - messageTimer.Dispose(); - messageTimer = null; - } - - messageTimer = new Timer - { - AutoReset = true - }; - messageTimer.Elapsed += new ElapsedEventHandler(AdUserInProcess); - messageTimer.Interval = 1000 * 60 * 120;// 60鍒嗛挓 60000 * adTimeJ; - messageTimer.Start(); - } /// /// 娴佺▼纭 瀹氭椂鎵ц 绯荤粺鍚姩5鍒嗛挓 @@ -112,27 +61,7 @@ namespace BLL /// private static Timer weatherTimer; - /// - /// 鍚姩鐩戣鍣,涓嶄竴瀹氳兘鎴愬姛锛屾牴鎹郴缁熻缃喅瀹氬鐩戣鍣ㄦ墽琛岀殑鎿嶄綔 绯荤粺鍚姩5鍒嗛挓 - /// - public static void StartWeather() - { - if (weatherTimer != null) - { - weatherTimer.Stop(); - weatherTimer.Dispose(); - weatherTimer = null; - } - - weatherTimer = new Timer - { - AutoReset = true - }; - weatherTimer.Elapsed += new ElapsedEventHandler(AdWeather); - weatherTimer.Interval = 1000 * 60 * 60;// 60鍒嗛挓 60000 * adTimeJ; - weatherTimer.Start(); - } - + /// /// 娴佺▼纭 瀹氭椂鎵ц 绯荤粺鍚姩5鍒嗛挓 /// @@ -197,27 +126,6 @@ namespace BLL /// private static Timer messageTimerEve; - /// - /// 鍚姩鐩戣鍣,涓嶄竴瀹氳兘鎴愬姛锛屾牴鎹郴缁熻缃喅瀹氬鐩戣鍣ㄦ墽琛岀殑鎿嶄綔 瀹氭椂 - /// - public static void StartMonitorEve() - { - if (messageTimerEve != null) - { - messageTimerEve.Stop(); - messageTimerEve.Dispose(); - messageTimerEve = null; - } - - messageTimerEve = new Timer - { - AutoReset = true - }; - messageTimerEve.Elapsed += new ElapsedEventHandler(ColligateFormConfirmProcessEve); - messageTimerEve.Interval = GetMessageTimerEveNextInterval(); - messageTimerEve.Start(); - } - /// /// 娴佺▼纭 瀹氭椂鎵ц 瀹氭椂00:05 鎵ц /// @@ -286,27 +194,6 @@ namespace BLL /// private static Timer personQuarterCheckTimer; - /// - /// 鍚姩鐩戣鍣,涓嶄竴瀹氳兘鎴愬姛锛屾牴鎹郴缁熻缃喅瀹氬鐩戣鍣ㄦ墽琛岀殑鎿嶄綔 瀹氭椂 - /// - public static void StartPersonQuarterCheck() - { - if (personQuarterCheckTimer != null) - { - personQuarterCheckTimer.Stop(); - personQuarterCheckTimer.Dispose(); - personQuarterCheckTimer = null; - } - - personQuarterCheckTimer = new Timer - { - AutoReset = true - }; - personQuarterCheckTimer.Elapsed += new ElapsedEventHandler(AddQuarterCheck); - personQuarterCheckTimer.Interval = 1000 * 3600 * 20; - personQuarterCheckTimer.Start(); - } - /// /// 娴佺▼纭 瀹氭椂鎵ц 瀹氭椂姣忓ぉ鎵ц /// diff --git a/SGGL/BLL/SysManage/LogService.cs b/SGGL/BLL/SysManage/LogService.cs index d595578..fadce01 100644 --- a/SGGL/BLL/SysManage/LogService.cs +++ b/SGGL/BLL/SysManage/LogService.cs @@ -7,7 +7,6 @@ namespace BLL public static class LogService { - public static Model.CNPCDB db = Funs.DB; /// /// 添加操作日志 @@ -81,28 +80,31 @@ namespace BLL /// public static void AddLog(string userId, string opLog) { - //SetOvertime(userId); - Model.Sys_Log log = new Model.Sys_Log + using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { - LogId = SQLHelper.GetNewID(typeof(Model.Sys_Log)), - HostName = Dns.GetHostName() - }; - IPAddress[] ips = Dns.GetHostAddresses(log.HostName); - if (ips.Length > 0) - { - foreach (IPAddress ip in ips) + //SetOvertime(userId); + Model.Sys_Log log = new Model.Sys_Log { - if (ip.ToString().IndexOf('.') != -1) + LogId = SQLHelper.GetNewID(typeof(Model.Sys_Log)), + HostName = Dns.GetHostName() + }; + IPAddress[] ips = Dns.GetHostAddresses(log.HostName); + if (ips.Length > 0) + { + foreach (IPAddress ip in ips) { - log.Ip = ip.ToString(); + if (ip.ToString().IndexOf('.') != -1) + { + log.Ip = ip.ToString(); + } } } + log.OperationTime = DateTime.Now; + log.OperationLog = opLog; + log.UserId = userId; + db.Sys_Log.InsertOnSubmit(log); + db.SubmitChanges(); } - log.OperationTime = DateTime.Now; - log.OperationLog = opLog; - log.UserId = userId; - db.Sys_Log.InsertOnSubmit(log); - db.SubmitChanges(); } /// diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs b/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs index 3b7b61e..18808f8 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs @@ -6,7 +6,6 @@ namespace BLL public static class DataForJTApiService { - public static Model.CNPCDB db = Funs.DB; /// /// 获取接口设置信息 diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs index cf66086..8a07488 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs @@ -1,26 +1,20 @@ 锘縰sing FineUIPro; -using Newtonsoft.Json; using System; using System.Collections; -using System.Collections.Generic; -using System.Drawing.Printing; using System.Linq; -using System.Runtime.InteropServices; -using System.Text; - namespace BLL { - - public static class InterFaceLogService + + public static class InterFaceLogService { public static Model.CNPCDB db = Funs.DB; public const string Type1 = "涓婃姤"; - public const string Type2= "涓嬪彂"; + public const string Type2 = "涓嬪彂"; public const string Type3 = "鍥炶皟"; - - #region 鑾峰彇鍒楄〃 + + #region 鑾峰彇鍒楄〃 /// /// 璁板綍鏁 /// @@ -29,25 +23,25 @@ namespace BLL get; set; } - public static List GetInterFaceLogByModle(Model.InterFaceLog table) - { - var q= from x in db.InterFaceLog - where - ( string.IsNullOrEmpty(table.InterFaceLogId)||x.InterFaceLogId.Contains(table.InterFaceLogId)) && - ( string.IsNullOrEmpty(table.UserId)||x.UserId.Contains(table.UserId)) && - ( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) && - ( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) && - ( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) && - ( string.IsNullOrEmpty(table.InterFaceMehtod)||x.InterFaceMehtod.Contains(table.InterFaceMehtod)) && - ( string.IsNullOrEmpty(table.InterFaceBody)||x.InterFaceBody.Contains(table.InterFaceBody)) && - ( string.IsNullOrEmpty(table.InterFaceReturnData)||x.InterFaceReturnData.Contains(table.InterFaceReturnData)) && - ( string.IsNullOrEmpty(table.InterFaceType)||x.InterFaceType.Contains(table.InterFaceType)) && - ( string.IsNullOrEmpty(table.IP)||x.IP.Contains(table.IP)) - orderby x.InterFaceLogDate descending - select x - ; - - return q.ToList(); + public static IQueryable GetInterFaceLogByModle(Model.InterFaceLog table) + { + var q = from x in db.InterFaceLog + where + (string.IsNullOrEmpty(table.InterFaceLogId) || x.InterFaceLogId.Contains(table.InterFaceLogId)) && + (string.IsNullOrEmpty(table.UserId) || x.UserId.Contains(table.UserId)) && + (string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) && + (string.IsNullOrEmpty(table.InterFaceName) || x.InterFaceName.Contains(table.InterFaceName)) && + (string.IsNullOrEmpty(table.InterFaceUrl) || x.InterFaceUrl.Contains(table.InterFaceUrl)) && + (string.IsNullOrEmpty(table.InterFaceMehtod) || x.InterFaceMehtod.Contains(table.InterFaceMehtod)) && + (string.IsNullOrEmpty(table.InterFaceBody) || x.InterFaceBody.Contains(table.InterFaceBody)) && + (string.IsNullOrEmpty(table.InterFaceReturnData) || x.InterFaceReturnData.Contains(table.InterFaceReturnData)) && + (string.IsNullOrEmpty(table.InterFaceType) || x.InterFaceType.Contains(table.InterFaceType)) && + (string.IsNullOrEmpty(table.IP) || x.IP.Contains(table.IP)) + orderby x.InterFaceLogDate descending + select x + ; + + return q; } /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -57,62 +51,60 @@ namespace BLL /// public static IEnumerable getListData(Model.InterFaceLog table, Grid Grid1) { - var q= GetInterFaceLogByModle(table); + var q = GetInterFaceLogByModle(table); count = q.Count(); if (count == 0) { return null; } - q = q.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList(); - // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + q = q.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize); + // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); return (from x in q - select new - { - x.InterFaceLogId, - x.UserId, - x.UnitId, - x.InterFaceName, - x.InterFaceUrl, - x.InterFaceMehtod, - x.InterFaceBody, - x.InterFaceReturnData, - x.InterFaceLogDate, - x.InterFaceType, - x.LogSate, - x.IP, - - }); + select new + { + x.InterFaceLogId, + x.UserId, + x.UnitId, + x.InterFaceName, + x.InterFaceUrl, + x.InterFaceMehtod, + x.InterFaceBody, + x.InterFaceReturnData, + x.InterFaceLogDate, + x.InterFaceType, + x.LogSate, + x.IP, + + }).ToList(); } #endregion - public static Model.InterFaceLog GetInterFaceLogById(string InterFaceLogId) - { - return db.InterFaceLog.FirstOrDefault(x=>x.InterFaceLogId==InterFaceLogId); + public static Model.InterFaceLog GetInterFaceLogById(string InterFaceLogId) + { + return db.InterFaceLog.FirstOrDefault(x => x.InterFaceLogId == InterFaceLogId); } - public static void AddInterFaceLog(Model.InterFaceLog newtable) { - - - Model.InterFaceLog table = new Model.InterFaceLog{ - InterFaceLogId=newtable.InterFaceLogId, - UserId=newtable.UserId, - UnitId=newtable.UnitId, - InterFaceName=newtable.InterFaceName, - InterFaceUrl=newtable.InterFaceUrl, - InterFaceMehtod=newtable.InterFaceMehtod, - InterFaceBody=newtable.InterFaceBody, - InterFaceReturnData=newtable.InterFaceReturnData, - InterFaceLogDate=newtable.InterFaceLogDate, - InterFaceType=newtable.InterFaceType, - LogSate=newtable.LogSate, - IP=newtable.IP, + Model.InterFaceLog table = new Model.InterFaceLog + { + InterFaceLogId = newtable.InterFaceLogId, + UserId = newtable.UserId, + UnitId = newtable.UnitId, + InterFaceName = newtable.InterFaceName, + InterFaceUrl = newtable.InterFaceUrl, + InterFaceMehtod = newtable.InterFaceMehtod, + InterFaceBody = newtable.InterFaceBody, + InterFaceReturnData = newtable.InterFaceReturnData, + InterFaceLogDate = newtable.InterFaceLogDate, + InterFaceType = newtable.InterFaceType, + LogSate = newtable.LogSate, + IP = newtable.IP, }; Funs.DB.InterFaceLog.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } - public static void WriteInterFaceLog(string InterFaceSetlId, string InterFaceBody, string ReturnData, string InterFaceType,bool isSuccess) + public static void WriteInterFaceLog(string InterFaceSetlId, string InterFaceBody, string ReturnData, string InterFaceType, bool isSuccess) { var InterfaceSetModel = InterFaceSetService.GetInterFaceSetById(InterFaceSetlId); Model.InterFaceLog table = new Model.InterFaceLog(); @@ -131,7 +123,7 @@ namespace BLL table.UnitId = InterfaceSetModel.UnitId; table.InterFaceUrl = InterfaceSetModel.InterFaceUrl; table.InterFaceMehtod = InterfaceSetModel.UrlReqMethod; - + break; case Type2: table.UnitId = InterfaceSetModel.AuthUnitIds; @@ -150,36 +142,34 @@ namespace BLL public static void UpdateInterFaceLog(Model.InterFaceLog newtable) { - - Model.InterFaceLog table = db.InterFaceLog.FirstOrDefault(x=>x.InterFaceLogId==newtable.InterFaceLogId); - if (table != null) + + Model.InterFaceLog table = db.InterFaceLog.FirstOrDefault(x => x.InterFaceLogId == newtable.InterFaceLogId); + if (table != null) { - table.InterFaceLogId=newtable.InterFaceLogId; - table.UserId=newtable.UserId; - table.UnitId=newtable.UnitId; - table.InterFaceName=newtable.InterFaceName; - table.InterFaceUrl=newtable.InterFaceUrl; - table.InterFaceMehtod=newtable.InterFaceMehtod; - table.InterFaceBody=newtable.InterFaceBody; - table.InterFaceReturnData=newtable.InterFaceReturnData; - table.InterFaceLogDate=newtable.InterFaceLogDate; - table.InterFaceType=newtable.InterFaceType; - table.LogSate=newtable.LogSate; - table.IP=newtable.IP; + table.InterFaceLogId = newtable.InterFaceLogId; + table.UserId = newtable.UserId; + table.UnitId = newtable.UnitId; + table.InterFaceName = newtable.InterFaceName; + table.InterFaceUrl = newtable.InterFaceUrl; + table.InterFaceMehtod = newtable.InterFaceMehtod; + table.InterFaceBody = newtable.InterFaceBody; + table.InterFaceReturnData = newtable.InterFaceReturnData; + table.InterFaceLogDate = newtable.InterFaceLogDate; + table.InterFaceType = newtable.InterFaceType; + table.LogSate = newtable.LogSate; + table.IP = newtable.IP; Funs.DB.SubmitChanges(); } - + } - public static void DeleteInterFaceLogById (string InterFaceLogId) - { - - Model.InterFaceLog table =Funs.DB.InterFaceLog.FirstOrDefault(x=>x.InterFaceLogId==InterFaceLogId); - if (table != null) - { + public static void DeleteInterFaceLogById(string InterFaceLogId) + { + Model.InterFaceLog table = Funs.DB.InterFaceLog.FirstOrDefault(x => x.InterFaceLogId == InterFaceLogId); + if (table != null) + { Funs.DB.InterFaceLog.DeleteOnSubmit(table); Funs.DB.SubmitChanges(); - } - + } } } diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceService.cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceService.cs new file mode 100644 index 0000000..f342020 --- /dev/null +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceService.cs @@ -0,0 +1,187 @@ +namespace BLL +{ + using Model; + using System; + using System.Collections.Generic; + using System.Linq; + using System.Web.UI.WebControls; + + public static class InterFaceService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 获取接口设置信息 + /// + /// 设置Id + /// 接口设置信息 + public static Model.InterFaceSet GetFaceSetById(string InterFaceSetId) + { + return Funs.DB.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == InterFaceSetId); + } + + /// + /// 增加接口设置信息 + /// + /// 接口设置 + public static void AddFaceSet(Model.InterFaceSet faceset) + { + Model.SGGLDB db = Funs.DB; + string newKeyID = SQLHelper.GetNewID(typeof(Model.InterFaceSet)); + List detailList = new List(); + Model.InterFaceSet newSet = new Model.InterFaceSet + { + InterFaceSetId = newKeyID, + InterFaceName = faceset.InterFaceName, + AuthUnitIds = faceset.AuthUnitIds, + AuthUnitName = faceset.AuthUnitName, + InterFaceUrl = faceset.InterFaceUrl, + InterFaceForUrl = faceset.InterFaceForUrl, + ValidPeriod = faceset.ValidPeriod, + UnitId = faceset.UnitId, + TxtRemarks = faceset.TxtRemarks, + IsOpen = faceset.IsOpen, + IsReqPost = faceset.IsReqPost, + IsCallBack= faceset.IsCallBack, + InterFaceCallBackUrl= faceset.InterFaceCallBackUrl, + }; + //明细表 + foreach (var AuthUnitId in newSet.AuthUnitIds.Split(',')) + { + Model.InterFaceDetail deteil = new Model.InterFaceDetail + { + InterFaceDetailId = SQLHelper.GetNewID(typeof(Model.InterFaceDetail)), + InterFaceName = newSet.InterFaceName, + UnitId = newSet.UnitId, + AuthUnitIds = AuthUnitId, + InterFaceSetlId = newSet.InterFaceSetId, + ReportState = false, + GainState = false, + }; + detailList.Add(deteil); + } + db.InterFaceDetail.InsertAllOnSubmit(detailList); + db.InterFaceSet.InsertOnSubmit(newSet); + db.SubmitChanges(); + } + + /// + /// 修改接口设置信息 + /// + /// 接口设置实体 + public static void UpdateFaceSet(Model.InterFaceSet user) + { + Model.SGGLDB db = Funs.DB; + List detailList = new List(); + Model.InterFaceSet newSet = db.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == user.InterFaceSetId); + if (newSet != null) + { + newSet.InterFaceName = user.InterFaceName; + newSet.AuthUnitIds = user.AuthUnitIds; + newSet.AuthUnitName = user.AuthUnitName; + newSet.InterFaceUrl = user.InterFaceUrl; + newSet.InterFaceForUrl = user.InterFaceForUrl; + newSet.UnitId = user.UnitId; + newSet.ValidPeriod = user.ValidPeriod; + newSet.UnitId = user.UnitId; + newSet.TxtRemarks = user.TxtRemarks; + newSet.IsOpen = user.IsOpen; + newSet.IsReqPost = user.IsReqPost; + newSet.IsCallBack = user.IsCallBack; + newSet.InterFaceCallBackUrl= user.InterFaceCallBackUrl; + var AuthUnitIds = newSet.AuthUnitIds.Split(','); + //明细表 + List FaceDetailList = db.InterFaceDetail.Where(e => e.InterFaceSetlId == user.InterFaceSetId).ToList(); + //删除无效明细 + var oldDetails = FaceDetailList.Where(p=> !AuthUnitIds.Equals(p.AuthUnitIds)) ; + if (oldDetails.Count() > 0) + { + db.InterFaceDetail.DeleteAllOnSubmit(oldDetails); + } + foreach (var AuthUnitId in AuthUnitIds) + { + Model.InterFaceDetail deteil = new Model.InterFaceDetail + { + InterFaceDetailId = SQLHelper.GetNewID(typeof(Model.InterFaceDetail)), + InterFaceName = newSet.InterFaceName, + UnitId = newSet.UnitId, + AuthUnitIds = AuthUnitId, + InterFaceSetlId = newSet.InterFaceSetId, + }; + var FaceDetail = FaceDetailList.FirstOrDefault(p => p.AuthUnitIds == AuthUnitId); + if (FaceDetail == null) + { + detailList.Add(deteil); + } + } + db.InterFaceDetail.InsertAllOnSubmit(detailList); + db.SubmitChanges(); + } + } + /// + /// 根据Id删除信息 + /// + /// + public static void DeleteFaceSet(string SetId) + { + Model.SGGLDB db = Funs.DB; + Model.InterFaceSet FaceSet = db.InterFaceSet.FirstOrDefault(e => e.InterFaceSetId == SetId); + if (FaceSet != null) + { + var logs = from x in db.Sys_Log where x.UserId == SetId select x; + if (logs.Count() > 0) + { + db.Sys_Log.DeleteAllOnSubmit(logs); + } + db.InterFaceSet.DeleteOnSubmit(FaceSet); + db.SubmitChanges(); + } + } + + /// + /// 保存上报数据记录 + /// + /// 上报数据 + /// + public static string SaveUpData(Model.InterFaceItem newItem) + { + if (newItem.FaceLogDate.Count() == 0) + return "数据不可为空！"; + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List InterFaceLogIdList = new List(); + List logList = new List(); + string message = string.Empty; + var FaceDetailList = db.InterFaceDetail.Where(x => newItem.FaceLogDate.Select(p=>p.UnitId).Equals(x.UnitId)); + foreach (var item in newItem.FaceLogDate) + { + //如果配置接口名称存在 进行数据保存 + var faceDetail = FaceDetailList.FirstOrDefault(p => p.InterFaceName == item.InterFaceName); + if (faceDetail != null) + { + faceDetail.ReportDate = DateTime.Now; + faceDetail.ReportState = true; + Model.InterFaceLog FaceLog = new Model.InterFaceLog(); + FaceLog.InterFaceLogId = SQLHelper.GetNewID(typeof(Model.InterFaceLog)); + FaceLog.TxtContent = item.TxtContent; + FaceLog.InterFaceLogDate = Convert.ToDateTime(item.InterFaceLogDate); + FaceLog.LogSate = false; + FaceLog.CollCropCode = item.CollCropCode; + FaceLog.IP = item.IP; + FaceLog.UnitId = item.UnitId; + FaceLog.InterFaceDetailId = faceDetail.InterFaceDetailId; + logList.Add(FaceLog); + } + else //配置接口名称不存在 记录反馈给前端提示 + { + InterFaceLogIdList.Add(item.InterFaceName); + } + } + db.InterFaceLog.InsertAllOnSubmit(logList); + db.SubmitChanges(); + } + + return "数据同步成功"; + } + } +} diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceSetService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceSetService .cs index 15f6259..f10bfaf 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceSetService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceSetService .cs @@ -8,12 +8,9 @@ using System.Text; namespace BLL { - - public static class InterFaceSetService + public static class InterFaceSetService { - - - #region 鑾峰彇鍒楄〃 + #region 鑾峰彇鍒楄〃 /// /// 璁板綍鏁 /// @@ -22,24 +19,24 @@ namespace BLL get; set; } - public static List GetInterFaceSetByModle(Model.InterFaceSet table) - { - var q= from x in Funs.DB.InterFaceSet - where - ( string.IsNullOrEmpty(table.InterFaceSetId)||x.InterFaceSetId.Contains(table.InterFaceSetId)) && - ( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) && - ( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) && - ( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) && - ( string.IsNullOrEmpty(table.AuthUnitIds)||x.AuthUnitIds.Contains(table.AuthUnitIds)) && - ( string.IsNullOrEmpty(table.AuthUnitName)||x.AuthUnitName.Contains(table.AuthUnitName)) && - ( string.IsNullOrEmpty(table.ValidPeriod)||x.ValidPeriod.Contains(table.ValidPeriod)) && - ( string.IsNullOrEmpty(table.TxtRemarks)||x.TxtRemarks.Contains(table.TxtRemarks)) && - ( string.IsNullOrEmpty(table.InterFaceForUrl)||x.InterFaceForUrl.Contains(table.InterFaceForUrl)) && - ( string.IsNullOrEmpty(table.InterFaceCallBackUrl)||x.InterFaceCallBackUrl.Contains(table.InterFaceCallBackUrl)) - select x - ; - - return q.ToList(); + public static List GetInterFaceSetByModle(Model.InterFaceSet table) + { + var q = from x in Funs.DB.InterFaceSet + where + (string.IsNullOrEmpty(table.InterFaceSetId) || x.InterFaceSetId.Contains(table.InterFaceSetId)) && + (string.IsNullOrEmpty(table.InterFaceName) || x.InterFaceName.Contains(table.InterFaceName)) && + (string.IsNullOrEmpty(table.InterFaceUrl) || x.InterFaceUrl.Contains(table.InterFaceUrl)) && + (string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) && + (string.IsNullOrEmpty(table.AuthUnitIds) || x.AuthUnitIds.Contains(table.AuthUnitIds)) && + (string.IsNullOrEmpty(table.AuthUnitName) || x.AuthUnitName.Contains(table.AuthUnitName)) && + (string.IsNullOrEmpty(table.ValidPeriod) || x.ValidPeriod.Contains(table.ValidPeriod)) && + (string.IsNullOrEmpty(table.TxtRemarks) || x.TxtRemarks.Contains(table.TxtRemarks)) && + (string.IsNullOrEmpty(table.InterFaceForUrl) || x.InterFaceForUrl.Contains(table.InterFaceForUrl)) && + (string.IsNullOrEmpty(table.InterFaceCallBackUrl) || x.InterFaceCallBackUrl.Contains(table.InterFaceCallBackUrl)) + select x + ; + + return q.ToList(); } /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -49,107 +46,113 @@ namespace BLL /// public static IEnumerable getListData(Model.InterFaceSet table, Grid Grid1) { - var q= GetInterFaceSetByModle(table); + var q = GetInterFaceSetByModle(table); count = q.Count(); if (count == 0) { return null; } // q= q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList(); - // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); return from x in q select new { - x.InterFaceSetId, - x.InterFaceName, - x.InterFaceUrl, - x.UnitId, - x.AuthUnitIds, - x.AuthUnitName, - x.IsOpen, - x.ValidPeriod, - x.TxtRemarks, - x.InterFaceForUrl, - x.IsCallBack, - x.InterFaceCallBackUrl, - x.UrlReqMethod, - x.CallBackUrlReqMethod, - x.ForUrlReqMethod - + x.InterFaceSetId, + x.InterFaceName, + x.InterFaceUrl, + x.UnitId, + x.AuthUnitIds, + x.AuthUnitName, + x.IsOpen, + x.ValidPeriod, + x.TxtRemarks, + x.InterFaceForUrl, + x.IsCallBack, + x.InterFaceCallBackUrl, + x.UrlReqMethod, + x.CallBackUrlReqMethod, + x.ForUrlReqMethod + }; } #endregion - public static Model.InterFaceSet GetInterFaceSetById(string InterFaceSetId) - { - return Funs.DB.InterFaceSet.FirstOrDefault(x=>x.InterFaceSetId==InterFaceSetId); - } - public static List GetInterFaceSets() + public static Model.InterFaceSet GetInterFaceSetById(string InterFaceSetId) { - var q = (from x in Funs.DB.InterFaceSet select x).ToList(); + return Funs.DB.InterFaceSet.FirstOrDefault(x => x.InterFaceSetId == InterFaceSetId); + } + public static List GetInterFaceSets() + { + var q = (from x in Funs.DB.InterFaceSet select x).ToList(); return q; } public static void AddInterFaceSet(Model.InterFaceSet newtable) { - - Model.InterFaceSet table = new Model.InterFaceSet{ - InterFaceSetId=newtable.InterFaceSetId, - InterFaceName=newtable.InterFaceName, - InterFaceUrl=newtable.InterFaceUrl, - UnitId=newtable.UnitId, - AuthUnitIds=newtable.AuthUnitIds, - AuthUnitName=newtable.AuthUnitName, - IsOpen=newtable.IsOpen, - ValidPeriod=newtable.ValidPeriod, - TxtRemarks=newtable.TxtRemarks, - InterFaceForUrl=newtable.InterFaceForUrl, - IsCallBack=newtable.IsCallBack, - InterFaceCallBackUrl=newtable.InterFaceCallBackUrl, - UrlReqMethod=newtable.UrlReqMethod, - ForUrlReqMethod=newtable.ForUrlReqMethod, - CallBackUrlReqMethod= newtable.CallBackUrlReqMethod, + + Model.InterFaceSet table = new Model.InterFaceSet + { + InterFaceSetId = newtable.InterFaceSetId, + InterFaceName = newtable.InterFaceName, + InterFaceUrl = newtable.InterFaceUrl, + UnitId = newtable.UnitId, + AuthUnitIds = newtable.AuthUnitIds, + AuthUnitName = newtable.AuthUnitName, + IsOpen = newtable.IsOpen, + ValidPeriod = newtable.ValidPeriod, + TxtRemarks = newtable.TxtRemarks, + InterFaceForUrl = newtable.InterFaceForUrl, + IsCallBack = newtable.IsCallBack, + InterFaceCallBackUrl = newtable.InterFaceCallBackUrl, + UrlReqMethod = newtable.UrlReqMethod, + ForUrlReqMethod = newtable.ForUrlReqMethod, + CallBackUrlReqMethod = newtable.CallBackUrlReqMethod, + IsSingleRequest = newtable.IsSingleRequest, + RequestJsonBody = newtable.RequestJsonBody, + }; Funs.DB.InterFaceSet.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } - + public static void UpdateInterFaceSet(Model.InterFaceSet newtable) { - - Model.InterFaceSet table = Funs.DB.InterFaceSet.FirstOrDefault(x=>x.InterFaceSetId==newtable.InterFaceSetId); - if (table != null) + + Model.InterFaceSet table = Funs.DB.InterFaceSet.FirstOrDefault(x => x.InterFaceSetId == newtable.InterFaceSetId); + if (table != null) { - table.InterFaceSetId=newtable.InterFaceSetId; - table.InterFaceName=newtable.InterFaceName; - table.InterFaceUrl=newtable.InterFaceUrl; - table.UnitId=newtable.UnitId; - table.AuthUnitIds=newtable.AuthUnitIds; - table.AuthUnitName=newtable.AuthUnitName; - table.IsOpen=newtable.IsOpen; - table.ValidPeriod=newtable.ValidPeriod; - table.TxtRemarks=newtable.TxtRemarks; - table.InterFaceForUrl=newtable.InterFaceForUrl; - table.IsCallBack=newtable.IsCallBack; - table.InterFaceCallBackUrl=newtable.InterFaceCallBackUrl; - table.UrlReqMethod=newtable.UrlReqMethod; - table.ForUrlReqMethod=newtable.ForUrlReqMethod; - table.CallBackUrlReqMethod=newtable.CallBackUrlReqMethod; + table.InterFaceSetId = newtable.InterFaceSetId; + table.InterFaceName = newtable.InterFaceName; + table.InterFaceUrl = newtable.InterFaceUrl; + table.UnitId = newtable.UnitId; + table.AuthUnitIds = newtable.AuthUnitIds; + table.AuthUnitName = newtable.AuthUnitName; + table.IsOpen = newtable.IsOpen; + table.ValidPeriod = newtable.ValidPeriod; + table.TxtRemarks = newtable.TxtRemarks; + table.InterFaceForUrl = newtable.InterFaceForUrl; + table.IsCallBack = newtable.IsCallBack; + table.InterFaceCallBackUrl = newtable.InterFaceCallBackUrl; + table.UrlReqMethod = newtable.UrlReqMethod; + table.ForUrlReqMethod = newtable.ForUrlReqMethod; + table.CallBackUrlReqMethod = newtable.CallBackUrlReqMethod; + table.IsSingleRequest = newtable.IsSingleRequest; + table.RequestJsonBody = newtable.RequestJsonBody; Funs.DB.SubmitChanges(); } - + } - public static void DeleteInterFaceSetById (string InterFaceSetId) - { - - Model.InterFaceSet table =Funs.DB.InterFaceSet.FirstOrDefault(x=>x.InterFaceSetId==InterFaceSetId); - if (table != null) - { + public static void DeleteInterFaceSetById(string InterFaceSetId) + { + + Model.InterFaceSet table = Funs.DB.InterFaceSet.FirstOrDefault(x => x.InterFaceSetId == InterFaceSetId); + if (table != null) + { Funs.DB.InterFaceSet.DeleteOnSubmit(table); Funs.DB.SubmitChanges(); - } - + } + } public static void InitInterFaceDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) { diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs index 40b28a4..28fe5cd 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs @@ -1,4 +1,5 @@ -锘縰sing FineUIPro; +锘縰sing FastReport.Cloud.StorageClient.Dropbox; +using FineUIPro; using Model; using Newtonsoft.Json; using Quartz; @@ -7,18 +8,16 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Security.Policy; using System.Text; namespace BLL { - - public static class InterFaceTaskService + public static class InterFaceTaskService { - public static Model.CNPCDB db = Funs.DB; - - - #region 鑾峰彇鍒楄〃 + + #region 鑾峰彇鍒楄〃 /// /// 璁板綍鏁 /// @@ -27,19 +26,20 @@ namespace BLL get; set; } - public static List GetInterFaceTaskByModle(Model.InterFaceTask table) - { - var q= from x in db.InterFaceTask - where - ( string.IsNullOrEmpty(table.InterFaceTaskId)||x.InterFaceTaskId.Contains(table.InterFaceTaskId)) && - ( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) && - ( string.IsNullOrEmpty(table.InterFaceSetLists)||x.InterFaceSetLists.Contains(table.InterFaceSetLists)) && - ( string.IsNullOrEmpty(table.Frequency)||x.Frequency.Contains(table.Frequency)) && - (table.Enable ==null|| x.Enable==table.Enable) - select x - ; - - return q.ToList(); + public static List GetInterFaceTaskByModle(Model.InterFaceTask table) + { + Model.CNPCDB db = Funs.DB; + var q = from x in db.InterFaceTask + where + (string.IsNullOrEmpty(table.InterFaceTaskId) || x.InterFaceTaskId.Contains(table.InterFaceTaskId)) && + (string.IsNullOrEmpty(table.InterFaceName) || x.InterFaceName.Contains(table.InterFaceName)) && + (string.IsNullOrEmpty(table.InterFaceSetLists) || x.InterFaceSetLists.Contains(table.InterFaceSetLists)) && + (string.IsNullOrEmpty(table.Frequency) || x.Frequency.Contains(table.Frequency)) && + (table.Enable == null || x.Enable == table.Enable) + select x + ; + + return q.ToList(); } /// 鑾峰彇鍒嗛〉鍒楄〃 @@ -49,79 +49,82 @@ namespace BLL /// public static IEnumerable getListData(Model.InterFaceTask table, Grid Grid1) { - var q= GetInterFaceTaskByModle(table); + var q = GetInterFaceTaskByModle(table); count = q.Count(); if (count == 0) { return null; } // q= q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList(); - // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); return from x in q select new { - x.InterFaceTaskId, - x.InterFaceName, - x.InterFaceSetLists, - x.Frequency, - x.CreateTime, - x.Enable, - + x.InterFaceTaskId, + x.InterFaceName, + x.InterFaceSetLists, + x.Frequency, + x.CreateTime, + x.Enable, }; } #endregion - public static Model.InterFaceTask GetInterFaceTaskById(string InterFaceTaskId) - { - return db.InterFaceTask.FirstOrDefault(x=>x.InterFaceTaskId==InterFaceTaskId); + public static Model.InterFaceTask GetInterFaceTaskById(string InterFaceTaskId) + { + Model.CNPCDB db = Funs.DB; + return db.InterFaceTask.FirstOrDefault(x => x.InterFaceTaskId == InterFaceTaskId); } public static void AddInterFaceTask(Model.InterFaceTask newtable) { - - Model.InterFaceTask table = new Model.InterFaceTask{ - InterFaceTaskId=newtable.InterFaceTaskId, - InterFaceName=newtable.InterFaceName, - InterFaceSetLists=newtable.InterFaceSetLists, - Frequency=newtable.Frequency, - CreateTime=newtable.CreateTime, - Enable=newtable.Enable, + + Model.CNPCDB db = Funs.DB; + Model.InterFaceTask table = new Model.InterFaceTask + { + InterFaceTaskId = newtable.InterFaceTaskId, + InterFaceName = newtable.InterFaceName, + InterFaceSetLists = newtable.InterFaceSetLists, + Frequency = newtable.Frequency, + CreateTime = newtable.CreateTime, + Enable = newtable.Enable, }; db.InterFaceTask.InsertOnSubmit(table); db.SubmitChanges(); } - + public static void UpdateInterFaceTask(Model.InterFaceTask newtable) { - - Model.InterFaceTask table = db.InterFaceTask.FirstOrDefault(x=>x.InterFaceTaskId==newtable.InterFaceTaskId); - if (table != null) + + Model.CNPCDB db = Funs.DB; + Model.InterFaceTask table = db.InterFaceTask.FirstOrDefault(x => x.InterFaceTaskId == newtable.InterFaceTaskId); + if (table != null) { - table.InterFaceTaskId=newtable.InterFaceTaskId; - table.InterFaceName=newtable.InterFaceName; - table.InterFaceSetLists=newtable.InterFaceSetLists; - table.Frequency=newtable.Frequency; - table.CreateTime=newtable.CreateTime; - table.Enable=newtable.Enable; + table.InterFaceTaskId = newtable.InterFaceTaskId; + table.InterFaceName = newtable.InterFaceName; + table.InterFaceSetLists = newtable.InterFaceSetLists; + table.Frequency = newtable.Frequency; + table.CreateTime = newtable.CreateTime; + table.Enable = newtable.Enable; db.SubmitChanges(); } - + } - public static void DeleteInterFaceTaskById (string InterFaceTaskId) - { - - Model.InterFaceTask table =db.InterFaceTask.FirstOrDefault(x=>x.InterFaceTaskId==InterFaceTaskId); - if (table != null) - { + public static void DeleteInterFaceTaskById(string InterFaceTaskId) + { + Model.CNPCDB db = Funs.DB; + Model.InterFaceTask table = db.InterFaceTask.FirstOrDefault(x => x.InterFaceTaskId == InterFaceTaskId); + if (table != null) + { db.InterFaceTask.DeleteOnSubmit(table); db.SubmitChanges(); - } - + } + } #region 鎵ц浠诲姟 public static void ExecuteTasks(string InterFaceTaskId) { - + var model = GetInterFaceTaskById(InterFaceTaskId); var InterFaceSetlIds = model.InterFaceSetLists.Split(','); foreach (var item in InterFaceSetlIds) @@ -143,13 +146,16 @@ namespace BLL } try { + if (InterfaceSetModel.IsSingleRequest == true) + { + var taskData = GetSingleRequestData(InterfaceSetModel.InterFaceUrl, InterfaceSetModel.RequestJsonBody, InterfaceSetModel.UrlReqMethod); + bool taskSuccess = taskData.code == 1; + InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, InterfaceSetModel.RequestJsonBody, JsonConvert.SerializeObject(taskData), InterFaceLogService.Type1, taskSuccess); + return; + } var sourseData = GetSourseData(InterfaceSetModel.InterFaceUrl, InterfaceSetModel.UrlReqMethod); - bool sourseisSuccess = false; - if (sourseData.code == 1) - { - sourseisSuccess = true; - } + bool sourseisSuccess = sourseData.code == 1; InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, "", JsonConvert.SerializeObject(sourseData), InterFaceLogService.Type1, sourseisSuccess); if (sourseData.code == 0) { @@ -157,11 +163,7 @@ namespace BLL } var TargetData = GetTargetData(InterfaceSetModel.InterFaceForUrl, sourseData, InterfaceSetModel.ForUrlReqMethod); - bool TargetisSuccess = false; - if (TargetData.code == 1) - { - TargetisSuccess = true; - } + bool TargetisSuccess = TargetData.code == 1; InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, JsonConvert.SerializeObject(sourseData.data), JsonConvert.SerializeObject(TargetData), InterFaceLogService.Type2, TargetisSuccess); if (TargetData.code == 0 || InterfaceSetModel.IsCallBack == false) @@ -178,27 +180,60 @@ namespace BLL InterFaceLogService.WriteInterFaceLog(InterFaceSetlId, JsonConvert.SerializeObject(sourseData.data), JsonConvert.SerializeObject(callbackData), InterFaceLogService.Type3, CallBackisSuccess); } - catch (Exception ex ) + catch (Exception ex) { - Model.InterFaceLog interFaceLog=new InterFaceLog(); - interFaceLog.InterFaceLogId=Guid.NewGuid().ToString(); + Model.InterFaceLog interFaceLog = new InterFaceLog(); + interFaceLog.InterFaceLogId = Guid.NewGuid().ToString(); interFaceLog.InterFaceType = "寮傚父"; interFaceLog.LogSate = false; - interFaceLog.InterFaceLogDate= DateTime.Now; + interFaceLog.InterFaceLogDate = DateTime.Now; interFaceLog.InterFaceName = InterfaceSetModel.InterFaceName; interFaceLog.InterFaceReturnData = ex.ToString(); InterFaceLogService.AddInterFaceLog(interFaceLog); } - } - public static Model.ReturnData GetSourseData(string baseurl,string ReqMethod) + public static Model.ReturnData GetSingleRequestData(string baseurl, string requestJsonBody, string ReqMethod) { Model.ReturnData returnData = new ReturnData(); string token = "C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0"; string Content = ""; switch (ReqMethod) { - case "Get": + case "Get": + Content = Funs.RequestGet(baseurl, token); + break; + case "Post": + Content = Funs.RequestPost(baseurl, token, requestJsonBody); + break; + } + //var client = new RestClient(baseurl); + //client.Timeout = -1; + //var request = new RestRequest(Method.POST); + //request.AddHeader("token", "AF17168B-87BD-4GLY-1111-F0A0A1158F9B"); + //IRestResponse response = client.Execute(request); + //Console.WriteLine(response.Content); + try + { + returnData = JsonConvert.DeserializeObject(Content); + } + catch (Exception) + { + returnData.code = 0; + returnData.message = "鑾峰彇鏁版嵁澶辫触锛" + Content; + } + + + return returnData; + } + + public static Model.ReturnData GetSourseData(string baseurl, string ReqMethod) + { + Model.ReturnData returnData = new ReturnData(); + string token = "C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0"; + string Content = ""; + switch (ReqMethod) + { + case "Get": Content = Funs.RequestGet(baseurl, token); break; case "Post": @@ -213,7 +248,9 @@ namespace BLL //Console.WriteLine(response.Content); try { + ErrLogInfo.WriteLog($"銆怌ontent銆戯細{Content}"); returnData = JsonConvert.DeserializeObject(Content); + ErrLogInfo.WriteLog($"銆怌ontent222銆戯細{Content}"); } catch (Exception) { @@ -278,12 +315,13 @@ namespace BLL } return responeData; } - public static ReturnData ExecuteCallBack(string baseurl, ReturnData DataInput,string ReqMethod) + public static ReturnData ExecuteCallBack(string baseurl, ReturnData DataInput, string ReqMethod) { Model.ReturnData returnData = new ReturnData(); if (DataInput.code == 1) { string token = "AF17168B-87BD-4GLY-1111-F0A0A1158F9B"; + //string token = "C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0"; string Content = ""; switch (ReqMethod) { diff --git a/SGGL/BLL/TaskScheduling/TimerTask/TaskJob.cs b/SGGL/BLL/TaskScheduling/TimerTask/TaskJob.cs index 2b51945..6a7ac7c 100644 --- a/SGGL/BLL/TaskScheduling/TimerTask/TaskJob.cs +++ b/SGGL/BLL/TaskScheduling/TimerTask/TaskJob.cs @@ -14,14 +14,11 @@ namespace BLL // note: use context.MergedJobDataMap in production code JobDataMap dataMap = context.JobDetail.JobDataMap; string InterFaceTaskId = dataMap.GetString("InterFaceTaskId"); - + //浣跨敤寮傛浠诲姟鏉ュ疄鐜 await Task.Run(() => { - - InterFaceTaskService.ExecuteTasks(InterFaceTaskId); - - + InterFaceTaskService.ExecuteTasks(InterFaceTaskId); //Console.WriteLine($"{DateTime.Now}銆恵Thread.CurrentThread.ManagedThreadId}銆戯細鑷畾涔夌殑宸ヤ綔姝ｅ湪鎵ц... ..."); }); } diff --git a/SGGL/BLL/TaskScheduling/TimerTask/TimerTaskBase.cs b/SGGL/BLL/TaskScheduling/TimerTask/TimerTaskBase.cs index c4459a6..baff7d7 100644 --- a/SGGL/BLL/TaskScheduling/TimerTask/TimerTaskBase.cs +++ b/SGGL/BLL/TaskScheduling/TimerTask/TimerTaskBase.cs @@ -1,31 +1,25 @@ 锘 - using System; - using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Drawing.Printing; -using System.Linq; -using System.Security.Cryptography.X509Certificates; -using System.Text; -using System.Threading; using System.Threading.Tasks; - using Quartz; - using Quartz.Impl; +using Quartz; +using Quartz.Impl; - namespace BLL - { +namespace BLL +{ public class QuartzServices { public static async Task Init() { - + //鍒濆鍖栬鍒掕 StdSchedulerFactory factory = new StdSchedulerFactory(); - // StdSchedulerFactory factory = new StdSchedulerFactory(properties); + // StdSchedulerFactory factory = new StdSchedulerFactory(properties); IScheduler scheduler = await factory.GetScheduler(); - var jobAndTriggerMapping = new Dictionary>(); + var jobAndTriggerMapping = new Dictionary>(); // 灏嗘槧灏勫叧绯诲寘瑁呮垚鍒跺害瀛楀吀闆嗗悎 var model = new Model.InterFaceTask(); model.Enable = true; @@ -46,7 +40,7 @@ using System.Threading.Tasks; Funs.ScheduledTasks = scheduler; } - + public static void ISchedulerShupDown(IScheduler scheduler) { scheduler.Shutdown(); @@ -74,15 +68,15 @@ using System.Threading.Tasks; { var jobDetail1 = GetJobDetailByInterFaceTaskId(model.InterFaceTaskId); var trigger1 = GetTriggerByTime(model.InterFaceTaskId, model.Frequency); - await scheduler.ScheduleJob(jobDetail1, trigger1,true); + await scheduler.ScheduleJob(jobDetail1, trigger1, true); } else { - + var jobDetail1 = GetJobDetailByInterFaceTaskId(model.InterFaceTaskId); var trigger1 = GetTriggerByTime(model.InterFaceTaskId, model.Frequency); - await scheduler.ScheduleJob(jobDetail1, trigger1,true); + await scheduler.ScheduleJob(jobDetail1, trigger1, true); } } @@ -91,9 +85,9 @@ using System.Threading.Tasks; if (scheduler.GetJobDetail(jk, default) != null) { await scheduler.DeleteJob(jk, default); - - // SyncScheduledTasks(model.InterFaceTaskId, scheduler, 2); + + // SyncScheduledTasks(model.InterFaceTaskId, scheduler, 2); } } @@ -119,16 +113,16 @@ using System.Threading.Tasks; { if (type == 0) { - // Funs.ScheduledTasks.Add(InterFaceTaskId, scheduler); + // Funs.ScheduledTasks.Add(InterFaceTaskId, scheduler); } else if (type == 1) { - // Funs.ScheduledTasks.Remove(InterFaceTaskId); - // Funs.ScheduledTasks.Add(InterFaceTaskId, scheduler); + // Funs.ScheduledTasks.Remove(InterFaceTaskId); + // Funs.ScheduledTasks.Add(InterFaceTaskId, scheduler); } else if (type == 2) { - // Funs.ScheduledTasks.Remove(InterFaceTaskId); + // Funs.ScheduledTasks.Remove(InterFaceTaskId); } } public static IJobDetail GetJobDetailByInterFaceTaskId(string InterFaceTaskId) @@ -143,8 +137,9 @@ using System.Threading.Tasks; public static ReadOnlyCollection GetTriggerByTime(string InterFaceTaskId, string time) { string cron = "0 0 0/& * * ? "; - cron = cron.Replace("&", time); - // cron = "0 0/1 * * * ? "; + // cron = cron.Replace("&", time); + cron = time; + // cron = "0 0/1 * * * ? "; //鍒涘缓瑙﹀彂鍣 var trigger1 = new ReadOnlyCollection( new List() @@ -160,6 +155,5 @@ using System.Threading.Tasks; } } - } +} - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Global.asax.cs b/SGGL/FineUIPro.Web/Global.asax.cs index 24c3af1..b4ec9ad 100644 --- a/SGGL/FineUIPro.Web/Global.asax.cs +++ b/SGGL/FineUIPro.Web/Global.asax.cs @@ -34,39 +34,12 @@ //AppDomain.Unload(AppDomain.CurrentDomain); } - //////寰楀埌闆嗗洟鏈嶅姟鍣ㄨ矾寰 - try - { - string address = ConfigurationManager.AppSettings["endpoint"]; - Funs.SystemVersion = ConfigurationManager.AppSettings["SystemVersion"]; - } - catch (Exception ex) - { - ErrLogInfo.WriteLog("寰楀埌闆嗗洟鏈嶅姟鍣ㄥ湴鍧澶辫触!", ex); - } - ////瀹炲悕鍒跺悓姝ュ畾鏃跺櫒 - try - { - if (ConfigurationManager.AppSettings["EnableRealName"] == "True") - { - BLL.RealNameMonitorService.StartMonitor(); - } - } - catch (Exception ex) - { - ErrLogInfo.WriteLog("瀹炲悕鍒跺悓姝ュ畾鏃跺櫒鍚姩澶辫触!", ex); - } ////閫氱敤瀹氭椂鍣 try { ErrLogInfo.WriteLog("閫氱敤瀹氭椂鍣ㄥ紑鍚!" ); - BLL.MonitorService.StartMonitor(); - BLL.MonitorService.StartWeather(); - BLL.MonitorService.StartMonitorEve(); - //BLL.MonitorService.StartPersonQuarterCheck(); - //BLL.MonitorService.StartEnvironmentSync(); + QuartzServices.Init(); ErrLogInfo.WriteLog("閫氱敤瀹氭椂鍣ㄧ粨鏉!"); - } catch (Exception ex) { diff --git a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceEdit.aspx b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceEdit.aspx index 785a39a..b4ae7cb 100644 --- a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceEdit.aspx +++ b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceEdit.aspx @@ -45,7 +45,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx index dbd947b..532840e 100644 --- a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx +++ b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx @@ -56,11 +56,11 @@ - - @@ -70,7 +70,7 @@ - @@ -82,13 +82,13 @@ --%> - -