Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

.gitignore

@@ -29,3 +29,4 @@ Push/bin/
 Push/obj/
 packages/
 
+/Upload/Files/2022/06/30

CallCenterApi/CallCenterApi.Common/CallCenterApi.Common.csproj

@@ -70,6 +70,18 @@
       <Project>{4da219cc-911e-4c81-bb0b-df5183fd50ff}</Project>
       <Name>CallCenter.Utility</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CallCenterApi.BLL\CallCenterApi.BLL.csproj">
+      <Project>{d99011c9-0a57-4706-b073-091681effad7}</Project>
+      <Name>CallCenterApi.BLL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CallCenterApi.DB\CallCenterApi.DB.csproj">
+      <Project>{ae933bfc-b06c-4fe8-a352-0ce16db082d7}</Project>
+      <Name>CallCenterApi.DB</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CallCenterApi.Model\CallCenterApi.Model.csproj">
+      <Project>{03ac6599-ffc1-43db-8794-f42b9bf74ef5}</Project>
+      <Name>CallCenterApi.Model</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

CallCenterApi/CallCenterApi.Common/CommonHelper.cs

@@ -7,6 +7,8 @@ using System.Text.RegularExpressions;
 using System.Net;
 using System.IO;
 using System.Net.NetworkInformation;
+using CallCenterApi.DB;
+using System.Collections.Generic;
 
 namespace CallCenterApi.Common
 {
@@ -324,5 +326,71 @@ namespace CallCenterApi.Common
 
             return inUse;
         }
+
+
+        /// <summary>
+        ///   ///// 12345来源是110平台的工单结案时调用这个接口更新110的表的数据
+        /// </summary>
+        /// <param name="workorderid"></param>
+        public static void pushresult(string workorderid)
+        {
+            string url = Configs.GetValue("PushAyResultUrl");
+            //  string url = "http://localhost:51927/api/BusWorkorder/update";
+
+            Model.T_Bus_WorkOrder oldmodel = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
+
+            //根据工单编号获取110的报警单编号
+            string jjdbh = "";
+            var objorderid = DbHelperSQL.GetSingle("select jjdbh from dy_jjdb where workorderId='" + workorderid + "'");
+            if (objorderid != null)
+            {
+                jjdbh = objorderid.ToString();
+            }
+            else
+            {
+
+                return;
+            }
+
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("jjdbh", jjdbh);
+            dic.Add("F_Result", oldmodel.F_Result);
+
+            var result = Post(url, dic);
+
+        }
+        public static string Post(string url, Dictionary<string, object> dic)
+        {
+            string result = "";
+            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
+            req.Method = "POST";
+            req.ContentType = "application/x-www-form-urlencoded";
+            #region 添加Post 参数
+            StringBuilder builder = new StringBuilder();
+            int i = 0;
+            foreach (var item in dic)
+            {
+                if (i > 0)
+                    builder.Append("&");
+                builder.AppendFormat("{0}={1}", item.Key, item.Value);
+                i++;
+            }
+            byte[] data = Encoding.UTF8.GetBytes(builder.ToString());
+            req.ContentLength = data.Length;
+            using (Stream reqStream = req.GetRequestStream())
+            {
+                reqStream.Write(data, 0, data.Length);
+                reqStream.Close();
+            }
+            #endregion
+            HttpWebResponse resp = (HttpWebResponse)req.GetResponse();
+            Stream stream = resp.GetResponseStream();
+            //获取响应内容
+            using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
+            {
+                result = reader.ReadToEnd();
+            }
+            return result;
+        }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -139,4 +139,10 @@
 <add key="ForeNativeURL" value="http://172.16.1.5:8818/" />
       <add key="ISfiring" value="1" />
 
+  <add key="PushAyResultUrl" value="http://192.168.8.20:5566/api/BusWorkorder/update"/>
+  <add key="PushAyOrderUrl" value="http://192.168.8.20:5566/api/BusWorkorder/add"/>
+  <add key="SendToPhone" value="15605815106"/>
+
+  <add key="maindeptid" value="1600"/>
+  
 </appSettings>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -265,6 +265,14 @@ namespace CallCenterApi.Interface.Models.Common
         {
             return new button(64, "不通过");
         }
+
+
+        public static button trans()
+        {
+            return new button(66, "转110");
+        }
+
+
         /// <summary>
         /// 审核员退回
         /// </summary>
@@ -388,7 +396,11 @@ namespace CallCenterApi.Interface.Models.Common
                         buttons.Add(edit());
                         buttons.Add(back());
                         buttons.Add(Report());
+
+                        buttons.Add(trans());
                         
+
+
                     }
 
                     if (code == "ZXHWY")

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -82,6 +82,7 @@ namespace CallCenterApi.Model
         private int _f_tobereply = 0;
         private int _f_isopen = 0;
         private int _f_business = 0;
+        private int? _f_ordersign = 0;
 
         /// <summary>
         /// 
@@ -758,6 +759,14 @@ namespace CallCenterApi.Model
         public string F_See { set; get; }
         public int? F_Remind { set; get; }
         public string F_HandlingFile { set; get; }
+        /// <summary>
+        /// 推给110 是1,110推过来是2
+        /// </summary>
+        public int? F_OrderSign
+        {
+            set { _f_ordersign = value; }
+            get { return _f_ordersign; }
+        }
         #endregion Model
 
     }