Kaynağa Gözat

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

1550076451 2 yıl önce
ebeveyn
işleme
961cd8fa4e

+ 1 - 0
.gitignore

29
 Push/obj/
29
 Push/obj/
30
 packages/
30
 packages/
31
 
31
 
32
+/Upload/Files/2022/06/30

+ 12 - 0
CallCenterApi/CallCenterApi.Common/CallCenterApi.Common.csproj

70
       <Project>{4da219cc-911e-4c81-bb0b-df5183fd50ff}</Project>
70
       <Project>{4da219cc-911e-4c81-bb0b-df5183fd50ff}</Project>
71
       <Name>CallCenter.Utility</Name>
71
       <Name>CallCenter.Utility</Name>
72
     </ProjectReference>
72
     </ProjectReference>
73
+    <ProjectReference Include="..\CallCenterApi.BLL\CallCenterApi.BLL.csproj">
74
+      <Project>{d99011c9-0a57-4706-b073-091681effad7}</Project>
75
+      <Name>CallCenterApi.BLL</Name>
76
+    </ProjectReference>
77
+    <ProjectReference Include="..\CallCenterApi.DB\CallCenterApi.DB.csproj">
78
+      <Project>{ae933bfc-b06c-4fe8-a352-0ce16db082d7}</Project>
79
+      <Name>CallCenterApi.DB</Name>
80
+    </ProjectReference>
81
+    <ProjectReference Include="..\CallCenterApi.Model\CallCenterApi.Model.csproj">
82
+      <Project>{03ac6599-ffc1-43db-8794-f42b9bf74ef5}</Project>
83
+      <Name>CallCenterApi.Model</Name>
84
+    </ProjectReference>
73
   </ItemGroup>
85
   </ItemGroup>
74
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
86
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
75
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
87
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

+ 68 - 0
CallCenterApi/CallCenterApi.Common/CommonHelper.cs

7
 using System.Net;
7
 using System.Net;
8
 using System.IO;
8
 using System.IO;
9
 using System.Net.NetworkInformation;
9
 using System.Net.NetworkInformation;
10
+using CallCenterApi.DB;
11
+using System.Collections.Generic;
10
 
12
 
11
 namespace CallCenterApi.Common
13
 namespace CallCenterApi.Common
12
 {
14
 {
324
 
326
 
325
             return inUse;
327
             return inUse;
326
         }
328
         }
329
+
330
+
331
+        /// <summary>
332
+        ///   ///// 12345来源是110平台的工单结案时调用这个接口更新110的表的数据
333
+        /// </summary>
334
+        /// <param name="workorderid"></param>
335
+        public static void pushresult(string workorderid)
336
+        {
337
+            string url = Configs.GetValue("PushAyResultUrl");
338
+            //  string url = "http://localhost:51927/api/BusWorkorder/update";
339
+
340
+            Model.T_Bus_WorkOrder oldmodel = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
341
+
342
+            //根据工单编号获取110的报警单编号
343
+            string jjdbh = "";
344
+            var objorderid = DbHelperSQL.GetSingle("select jjdbh from dy_jjdb where workorderId='" + workorderid + "'");
345
+            if (objorderid != null)
346
+            {
347
+                jjdbh = objorderid.ToString();
348
+            }
349
+            else
350
+            {
351
+
352
+                return;
353
+            }
354
+
355
+            Dictionary<string, object> dic = new Dictionary<string, object>();
356
+            dic.Add("jjdbh", jjdbh);
357
+            dic.Add("F_Result", oldmodel.F_Result);
358
+
359
+            var result = Post(url, dic);
360
+
361
+        }
362
+        public static string Post(string url, Dictionary<string, object> dic)
363
+        {
364
+            string result = "";
365
+            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
366
+            req.Method = "POST";
367
+            req.ContentType = "application/x-www-form-urlencoded";
368
+            #region 添加Post 参数
369
+            StringBuilder builder = new StringBuilder();
370
+            int i = 0;
371
+            foreach (var item in dic)
372
+            {
373
+                if (i > 0)
374
+                    builder.Append("&");
375
+                builder.AppendFormat("{0}={1}", item.Key, item.Value);
376
+                i++;
377
+            }
378
+            byte[] data = Encoding.UTF8.GetBytes(builder.ToString());
379
+            req.ContentLength = data.Length;
380
+            using (Stream reqStream = req.GetRequestStream())
381
+            {
382
+                reqStream.Write(data, 0, data.Length);
383
+                reqStream.Close();
384
+            }
385
+            #endregion
386
+            HttpWebResponse resp = (HttpWebResponse)req.GetResponse();
387
+            Stream stream = resp.GetResponseStream();
388
+            //获取响应内容
389
+            using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
390
+            {
391
+                result = reader.ReadToEnd();
392
+            }
393
+            return result;
394
+        }
327
     }
395
     }
328
 }
396
 }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 14 - 5
CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs


+ 6 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

139
 <add key="ForeNativeURL" value="http://172.16.1.5:8818/" />
139
 <add key="ForeNativeURL" value="http://172.16.1.5:8818/" />
140
       <add key="ISfiring" value="1" />
140
       <add key="ISfiring" value="1" />
141
 
141
 
142
+  <add key="PushAyResultUrl" value="http://192.168.8.20:5566/api/BusWorkorder/update"/>
143
+  <add key="PushAyOrderUrl" value="http://192.168.8.20:5566/api/BusWorkorder/add"/>
144
+  <add key="SendToPhone" value="15605815106"/>
145
+
146
+  <add key="maindeptid" value="1600"/>
147
+  
142
 </appSettings>
148
 </appSettings>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 611 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs


Dosya farkı çok büyük olduğundan ihmal edildi
+ 161 - 21
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


+ 12 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

265
         {
265
         {
266
             return new button(64, "不通过");
266
             return new button(64, "不通过");
267
         }
267
         }
268
+
269
+
270
+        public static button trans()
271
+        {
272
+            return new button(66, "转110");
273
+        }
274
+
275
+
268
         /// <summary>
276
         /// <summary>
269
         /// 审核员退回
277
         /// 审核员退回
270
         /// </summary>
278
         /// </summary>
388
                         buttons.Add(edit());
396
                         buttons.Add(edit());
389
                         buttons.Add(back());
397
                         buttons.Add(back());
390
                         buttons.Add(Report());
398
                         buttons.Add(Report());
399
+
400
+                        buttons.Add(trans());
391
                         
401
                         
402
+
403
+
392
                     }
404
                     }
393
 
405
 
394
                     if (code == "ZXHWY")
406
                     if (code == "ZXHWY")

+ 9 - 0
CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

82
         private int _f_tobereply = 0;
82
         private int _f_tobereply = 0;
83
         private int _f_isopen = 0;
83
         private int _f_isopen = 0;
84
         private int _f_business = 0;
84
         private int _f_business = 0;
85
+        private int? _f_ordersign = 0;
85
 
86
 
86
         /// <summary>
87
         /// <summary>
87
         /// 
88
         /// 
758
         public string F_See { set; get; }
759
         public string F_See { set; get; }
759
         public int? F_Remind { set; get; }
760
         public int? F_Remind { set; get; }
760
         public string F_HandlingFile { set; get; }
761
         public string F_HandlingFile { set; get; }
762
+        /// <summary>
763
+        /// 推给110 是1,110推过来是2
764
+        /// </summary>
765
+        public int? F_OrderSign
766
+        {
767
+            set { _f_ordersign = value; }
768
+            get { return _f_ordersign; }
769
+        }
761
         #endregion Model
770
         #endregion Model
762
 
771
 
763
     }
772
     }