s

RMYY_CallCenter_Api/Common/InvokeZD.cs

@@ -12,9 +12,11 @@ namespace RMYY_CallCenter_Api
 {
     public class InvokeZD
     {
-        private static string domainUrl = "";
-      
-        public static  string ZDSubmitWorkOrder(Dictionary<string, object> dic ,string  usercode)
+        private static string domainUrl = ConfigHelper.GetValue("zddomainUrl");// "http://dev.zdha.cn";
+        private static string usercode = ConfigHelper.GetValue("zdusercode");
+
+
+        public static  string ZDSubmitWorkOrder(Dictionary<string, object> dic  )
         {
             HttpClient client = new HttpClient();
             var requestHeaders = new Dictionary<string, string>();
@@ -44,7 +46,7 @@ namespace RMYY_CallCenter_Api
 
         }
 
-        public static string ZDUrgeWorkOrder(Dictionary<string, object> dic, string usercode)
+        public static string ZDUrgeWorkOrder(Dictionary<string, object> dic )
         {
             HttpClient client = new HttpClient();
             var requestHeaders = new Dictionary<string, string>();
@@ -70,7 +72,7 @@ namespace RMYY_CallCenter_Api
 
         }
 
-        public static string ZDRevokeWorkOrder(Dictionary<string, object> dic, string usercode)
+        public static string ZDRevokeWorkOrder(Dictionary<string, object> dic )
         {
             HttpClient client = new HttpClient();
             var requestHeaders = new Dictionary<string, string>();
@@ -96,7 +98,7 @@ namespace RMYY_CallCenter_Api
 
         }
 
-        public static string ZDEvaluate(Dictionary<string, object> dic, string usercode)
+        public static string ZDEvaluate(Dictionary<string, object> dic )
         {
             HttpClient client = new HttpClient();
             var requestHeaders = new Dictionary<string, string>();
@@ -126,10 +128,10 @@ namespace RMYY_CallCenter_Api
 
         public static string GetToken(string userCode)
         {
-            string appKey = ConfigHelper.GetValue("zhidianappKey");
-            string appSecret = ConfigHelper.GetValue("zhidianappSecret");
+            string appKey = ConfigHelper.GetValue("zdappKey");
+            string appSecret = ConfigHelper.GetValue("zdappSecret");
           
-            string url = ConfigHelper.GetValue("zhidiantokenurl");
+            string url = ConfigHelper.GetValue("zdtokenurl");
 
             HttpClient client = new HttpClient();
             var requestHeaders = new Dictionary<string, string>();
@@ -142,7 +144,7 @@ namespace RMYY_CallCenter_Api
                 client.DefaultRequestHeaders.Add(item.Key, item.Value);
             }
 
-            HttpResponseMessage response = client.PostAsync(url, null).Result;
+            HttpResponseMessage response = client.GetAsync(url).Result;
 
             string result = response.Content.ReadAsStringAsync().Result;
             try

RMYY_CallCenter_Api/Configs/system.config

@@ -101,14 +101,22 @@
 <<<<<<< .merge_file_a58772
 =======
 
-  <add key="zhidianappKey" value=""/>
-  <add key="zhidianappSecret" value=""/>
-  <add key="zhidiantokenurl" value=""/>
-  <add key="zhidianaddurl" value=""/>
-  <add key="zdrevokeurl" value=""/>
-  <add key="zdurgeurl" value=""/>
-  <add key="zdaddurl" value=""/>
+  <add key="zddomainUrl" value="http://dev.zdha.cn"/>  
+  <add key="zdappKey" value="dev"/>
+  <add key="zdappSecret" value="uvMIVfC+TRPJJipOtydJO/65WbfUZC/L"/>
+  <add key="zdtokenurl" value="http://39.107.58.45:7788/hyht/access/author/getToken"/>
+ 
+  <add key="zdaddurl" value="http://39.107.58.45:7788/hyht/access/incident/add "/>
+  <add key="zdrevokeurl" value="http://39.107.58.45:7788/hyht/access/incident/close"/>
+  <add key="zdurgeurl" value="http://39.107.58.45:7788/hyht/access/incident/reminder"/>
+  <add key="zdevaurl" value="http://39.107.58.45:7788/hyht/access/incident/confirm"/>
+  
 
+  <add key="zdusercode" value="dev"/>
   
+<<<<<<< HEAD
 >>>>>>> .merge_file_a17920
+=======
+
+>>>>>>> 修改
 </appSettings>

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -669,7 +669,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                     }
                     
-                        string orderno = InvokeZD.ZDSubmitWorkOrder(dic, User.F_UserCode);
+                        string orderno = InvokeZD.ZDSubmitWorkOrder(dic);
                         if (!string.IsNullOrEmpty(orderno))
                         {
                             T_FaultRepair_Base updatemodel = baseBll.GetModel(model.F_WorkOrderCode);
@@ -679,9 +679,9 @@ namespace RMYY_CallCenter_Api.Controllers
                     
                     
                 }
-                catch (Exception)
+                catch (Exception e)
                 {
-
+                    string mens = e.Message;
                      
                 }
              
@@ -1014,6 +1014,40 @@ namespace RMYY_CallCenter_Api.Controllers
             //wcbll.Update(wcmodel);
 
             AddOperatorLog(User.F_UserName + "撤回了工单" + s, (int)EnumOperatorType.retract, model.F_WorkOrderCode);
+<<<<<<< HEAD
+=======
+
+            #region 信息类工单 撤回时推送给支点
+            int gdid = int.Parse(DbHelperSQL.GetSingle("select F_GDId from T_Sys_GongDan where F_ParentID = 3000 and F_Name = '信息类' ").ToString());
+
+            DataTable dtcate = DbHelperSQL.Query("select * from  dbo.GetValueId('" + gdid + "')").Tables[0];
+            string cate = model.F_WorkOrderCategory;//.F_SonType;
+            if (dtcate.Select("F_GDId='" + cate + "'").Count() > 0)
+            {
+                try
+                {
+                    Dictionary<string, object> dic = new Dictionary<string, object>();
+                    dic.Add("incidentNo", model.F_OrderNo);
+                    dic.Add("userNo", User.F_UserCode);
+                    if (!string.IsNullOrEmpty(BackReason))
+                    {
+                        BackReason = "无需再进行处理";
+                    }
+                    dic.Add("urgeMessage", BackReason);
+
+                    InvokeZD.ZDRevokeWorkOrder(dic);
+                }
+                catch (Exception)
+                {
+
+
+                }
+
+
+            }
+            #endregion
+
+>>>>>>> 修改
             return Success("撤回操作成功");
         }
 
@@ -2175,6 +2209,39 @@ namespace RMYY_CallCenter_Api.Controllers
                             }
 
                             baseBll.Update(model);
+<<<<<<< HEAD
+=======
+
+                            #region pingjia并且类型是xinxilei的工单，调用支点接口去催单
+
+                            int gdid = int.Parse(DbHelperSQL.GetSingle("select F_GDId from T_Sys_GongDan where F_ParentID = 3000 and F_Name = '信息类' ").ToString());
+
+                            DataTable dtcate = DbHelperSQL.Query("select * from  dbo.GetValueId('" + gdid + "')").Tables[0];
+                            string  cate = model.F_WorkOrderCategory;//.F_SonType;
+                            if (dtcate.Select("F_GDId='" + cate + "'").Count() > 0)
+                            {
+                                try
+                                {
+                                    Dictionary<string, object> dic = new Dictionary<string, object>();
+                                    dic.Add("incidentNo", model.F_OrderNo);
+                                    dic.Add("userNo", User.F_UserCode);
+                                    dic.Add("satisfactionType",4);
+                                    dic.Add("solveState", 1);
+                                    dic.Add("userSay", SX + "小时未评价自动评价满意");                   
+                                    InvokeZD.ZDEvaluate(dic);
+                                }
+                                catch (Exception)
+                                {
+
+
+                                }
+
+
+                            }
+                            #endregion
+
+
+>>>>>>> 修改
                             AddEvaluateOperatorLog(evaluatecontent, (int)EnumOperatorType.evaluate, model.F_WorkOrderCode);
 
                             #region 评价的时候如果有协作工单，协作工单评价数据和主工单保持一致，同时需要记录操作流程
@@ -2563,6 +2630,42 @@ namespace RMYY_CallCenter_Api.Controllers
                             model.MYD = 1;
                         }
                         baseBll.Update(model);
+<<<<<<< HEAD
+=======
+                        #region pingjia并且类型是xinxilei的工单，调用支点接口去催单
+
+                        int gdid = int.Parse(DbHelperSQL.GetSingle("select F_GDId from T_Sys_GongDan where F_ParentID = 3000 and F_Name = '信息类' ").ToString());
+
+                        DataTable dtcate = DbHelperSQL.Query("select * from  dbo.GetValueId('" + gdid + "')").Tables[0];
+                        string cate = model.F_WorkOrderCategory;//.F_SonType;
+                        if (dtcate.Select("F_GDId='" + cate + "'").Count() > 0)
+                        {
+                            try
+                            {
+                                Dictionary<string, object> dic = new Dictionary<string, object>();
+                                dic.Add("incidentNo", model.F_OrderNo);
+                                dic.Add("userNo", User.F_UserCode);
+                                dic.Add("satisfactionType", satisfactionType);
+                                dic.Add("solveState", 1);
+                                if (string.IsNullOrEmpty(EvaluateContent))
+                                {
+                                    EvaluateContent = "   ";
+                                }
+                                dic.Add("userSay", EvaluateContent);
+                                InvokeZD.ZDEvaluate(dic);
+                            }
+                            catch (Exception)
+                            {
+
+
+                            }
+
+
+                        }
+                        #endregion
+
+
+>>>>>>> 修改
                         #region 评价的时候如果有协作工单，协作工单评价数据和主工单保持一致，同时需要记录操作流程
                         if (!string.IsNullOrEmpty(model.F_InternalWorkOrderCode))
                         {
@@ -3677,6 +3780,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="timestamp"></param>
         /// <returns></returns>
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< .merge_file_a74564
         public ActionResult AddWorkOrder(long timestamp)
 =======
@@ -3696,6 +3800,9 @@ namespace RMYY_CallCenter_Api.Controllers
             string EmergencyTypes = HttpUtility.UrlDecode(RequestString.GetQueryString("EmergencyTypes"));
 =======
         public ActionResult SubmitWorkOrder(long timestamp,string filestr,string uuid,string Applicant,string ApplicationDeptCode, string Phone ,string Applicantsphone,string WorkOrderCategory,string Content,string PlaceOfRepair,string EmergencyTypes,string port_password)
+=======
+        public ActionResult SubmitWorkOrder(long timestamp,string filestr,string uuid,string Applicant,string ApplicationDeptCode, string Phone ,string Applicantsphone,string WorkOrderCategory,string Content,string PlaceOfRepair,string EmergencyTypes,string port_password,int? IsEnd = 0)
+>>>>>>> 修改
         {
             //string port_password = HttpUtility.UrlDecode(RequestString.GetQueryString("port_password"));   //加密信息(安全验证用)
             //string uuid = HttpUtility.UrlDecode(RequestString.GetQueryString("uuid"));          //客户唯一标识（安全验证用）
@@ -3768,6 +3875,16 @@ namespace RMYY_CallCenter_Api.Controllers
             Model.T_FaultRepair_Base model = new Model.T_FaultRepair_Base();      
 =======
 
+            string weiyisql = "   select COUNT(1) from T_Wo_CommonBase where F_orderNo='" + uuid + "'";
+            int weiyi = int.Parse(DbHelperSQL.GetSingle(weiyisql).ToString());
+            if (weiyi>0)
+            {
+                ajresult.state = (int)CodeStatus.异常结果类型;
+                ajresult.message = "工单已存在";
+                return Process();
+            }
+
+
             List<Files> files = new List<Files>();
             if (!string.IsNullOrEmpty(filestr))
             {
@@ -3821,6 +3938,7 @@ namespace RMYY_CallCenter_Api.Controllers
 >>>>>>> .merge_file_a11624
             model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
             model.F_EmergencyTypes = EmergencyTypes;
+<<<<<<< HEAD
          
             string message = "";
             var dicvalue = new Model.T_Sys_GongDan();
@@ -3830,6 +3948,27 @@ namespace RMYY_CallCenter_Api.Controllers
                 message = "\n工单类型:故障报修/" + dicvalue.F_Name;
             }
             model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.neworder;
+=======
+
+            if (IsEnd == 1)
+            {
+                
+
+                model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
+                model.F_MaintenanceDept = deptid;
+                model.F_Maintenancer = Applicant;
+                model.F_Endtime = DateTime.Now;
+                model.F_Deadline = DateTime.Now;
+
+            }
+
+            else
+            {
+                model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.neworder;
+
+            }
+
+>>>>>>> 修改
             model.F_CreateTime = DateTime.Now;
             model.F_CreateUser = Applicant;
             model.F_CreateUserDept = deptid;
@@ -3843,6 +3982,7 @@ namespace RMYY_CallCenter_Api.Controllers
 =======
               
                 AddOperatorLogNew( "创建报修工单", (int)EnumOperatorType.add, model.F_WorkOrderCode,Applicant);
+<<<<<<< HEAD
 >>>>>>> xiugai
                 return Success("添加成功！", returnid);
             }
@@ -3850,6 +3990,18 @@ namespace RMYY_CallCenter_Api.Controllers
              return Error("添加失败！");
 =======
             return Error("添加失败！");
+=======
+                // return Success("添加成功！", returnid);
+                ajresult.state = (int)CodeStatus.SUCCESS;               
+                ajresult.message = "添加成功";
+                return Process();
+            }
+             
+
+            ajresult.state = (int)CodeStatus.异常结果类型;
+            ajresult.message = "添加失败";
+            return Process();
+>>>>>>> 修改
 
         }
 
@@ -4138,7 +4290,10 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
             AddOperatorLogNew(  "撤回了工单" + s, (int)EnumOperatorType.retract, model.F_WorkOrderCode, Operator);
-            return Success("撤回操作成功");
+            //  return Success("撤回操作成功");
+            ajresult.state = (int)CodeStatus.SUCCESS;
+            ajresult.message = "撤回操作成功";
+            return Process();
 
 
 

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -523,7 +523,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         }
                         dic.Add("urgeMessage", reason);
                         
-                     var obj=   InvokeZD.ZDUrgeWorkOrder(dic, User.F_UserCode);
+                     var obj=   InvokeZD.ZDUrgeWorkOrder(dic );
                     }
                     catch (Exception e)
                     {