diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs index 7df3c5e8..69323e9f 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs @@ -114,9 +114,11 @@ namespace BLL } public static void AddBulkProject_HSSEData_HiddenDangerDetails(List newtables) { - - db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables); - db.SubmitChanges(); + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables); + db.SubmitChanges(); + } } public static void UpdateProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable) { diff --git a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs index 5d467e30..4877d790 100644 --- a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs +++ b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs @@ -122,19 +122,37 @@ namespace WebAPI.Controllers public Model.ReturnData PostGetHSSEData() { var returnData = new Model.ReturnData(); - returnData.type = "HSSE"; - returnData.time = DateTime.Now.ToString(); - ServerService.GetToken(); - returnData.token = BLL.SysConstSetService.CNCECToken; - returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime; - if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now) + try { - returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE(); + returnData.type = "HSSE"; + returnData.time = DateTime.Now.ToString(); + ServerService.GetToken(); + returnData.token = BLL.SysConstSetService.CNCECToken; + returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime; + if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now) + { + returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE(); + } + else + { + returnData.code = 500; + returnData.message = "token失效"; + } } - else + catch (Exception ex) { - returnData.code = 500; - returnData.message = "token失效"; + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Sys_Log syslog = new Model.Sys_Log + { + LogId = SQLHelper.GetNewID(), + OperationTime = DateTime.Now, + OperationLog = ex.Message, + LogSource = 1, + }; + db.Sys_Log.InsertOnSubmit(syslog); + db.SubmitChanges(); + } } return returnData; }