From a9148f6d78848da978a2983c3fb70a923ce2c828 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sat, 2 Sep 2023 10:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ject_HSSEData_HiddenDangerDetailService.cs |  8 ++--
 .../DataSync/CNCECServerController.cs         | 38 ++++++++++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

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<Model.Project_HSSEData_HiddenDangerDetail> 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;
         }