修改死锁

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -14,6 +14,8 @@ namespace CallCenterApi.DAL
     /// </summary>
     public partial class T_Call_CallRecords
     {
+        private static readonly object Global_Lock = new object();
+
         public T_Call_CallRecords()
         { }
         #region  BasicMethod
@@ -773,12 +775,22 @@ namespace CallCenterApi.DAL
             parameters[3].Value = model.ExtNumber;
             parameters[4].Value = model.CallId;
             parameters[5].Value = model.DealType;
-            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
-            if (rows > 0)
+            try
             {
-                return true;
+                lock (DAL.T_Call_CallRecords.Global_Lock)
+                {
+                    int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+                    if (rows > 0)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
             }
-            else
+            catch
             {
                 return false;
             }
@@ -808,14 +820,17 @@ namespace CallCenterApi.DAL
             parameters[0].Value = model.CallId;
             parameters[1].Value = model.CallState;
             parameters[2].Value = model.DealType;
-            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
-            if (rows > 0)
-            {
-                return true;
-            }
-            else
+            lock (DAL.T_Call_CallRecords.Global_Lock)
             {
-                return false;
+                int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+                if (rows > 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
             }
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -125,7 +125,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="TopSdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\TopSdk.dll</HintPath>
+      <HintPath>Lib\TopSdk.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -155,6 +155,7 @@
     <Content Include="Global.asax" />
     <Content Include="Lib\Senparc.Weixin.dll" />
     <Content Include="Lib\Senparc.Weixin.MP.dll" />
+    <Content Include="Lib\TopSdk.dll" />
     <Content Include="Txt\dirtywords.txt" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -463,7 +463,8 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
 
                 string strid = RequestString.GetFormString("callid");
-                bool bl = new BLL.T_Call_CallRecords().UpdateCallInHookTelRecord(strid);
+                //bool bl = new BLL.T_Call_CallRecords().UpdateCallInHookTelRecord(strid);
+                bool bl = true;
                 if (bl)
                 {
                     res = Success("更新挂机状态成功");
@@ -487,27 +488,29 @@ namespace CallCenterApi.Interface.Controllers.tel
             if (Request.IsAuthenticated)
             {
 
-                Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
-                model.CallId = RequestString.GetFormString("callid");
-                model.CallState = 1;
-                model.DealType = 6;
-                model.FilePath = RequestString.GetFormString("path");
-                bool bl = new BLL.T_Call_CallRecords().UpdateCallInPathTelRecord(model);
-                if (bl)
-                {
-                    Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(model.CallId);
-                    string type = vmodel.OperateType.ToString();
-                    if (type == "7")
-                    {
-                        new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
-                    }
+                //Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
+                //model.CallId = RequestString.GetFormString("callid");
+                //model.CallState = 1;
+                //model.DealType = 6;
+                //model.FilePath = RequestString.GetFormString("path");
+                //bool bl = new BLL.T_Call_CallRecords().UpdateCallInPathTelRecord(model);
+                //if (bl)
+                //{
+                //    Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(model.CallId);
+                //    string type = vmodel.OperateType.ToString();
+                //    if (type == "7")
+                //    {
+                //        new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
+                //    }
+
+                //    res = Success("更新挂机状态成功");
+                //}
+                //else
+                //{
+                //    res = Success("更新挂机状态失败");
+                //}
 
-                    res = Success("更新挂机状态成功");
-                }
-                else
-                {
-                    res = Success("更新挂机状态失败");
-                }
+                res = Success("更新挂机状态成功");
 
             }
             return res;