Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/NewCallCenter5.1_API

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

@@ -155,6 +155,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ffmpeg.exe" />
     <Content Include="Global.asax" />
     <Content Include="Lib\Senparc.Weixin.dll" />
     <Content Include="Lib\Senparc.Weixin.MP.dll" />

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IVRWordsController.cs

@@ -455,6 +455,7 @@ namespace CallCenterApi.Interface.Controllers
                         //删除本地文件
                         System.IO.File.Delete(savedir + fullFileName);
                         System.IO.File.Delete(savedir + temp_filename + ".wav");
+                        //System.IO.File.Delete(physicalpath);
                         var obj = new
                         {
                             oldname = fullFileName,

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RecordsController.cs

@@ -0,0 +1,367 @@
+using Baidu.Aip.Speech;
+using CallCenterApi.DB;
+using CallCenterApi.Interface.Controllers.Base;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers
+{
+    public class RecordsController : BaseController
+    {
+        // GET: Records
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        //语音识别
+        private Asr _asrClient;//readonly
+        //语音合成
+        private Tts _ttsClient;//readonly
+        //验证身份参数
+        string strAK = "PuGGxl9vGrdijDTBYFBhEdVx";
+        string strSK = "aGmyOET05Os0atXBxFWXsC9qf1GgXv6R";
+        string backdata = "";
+
+        //public SpeechDemo()
+        //{
+        //    _asrClient = new Asr(strAK, strSK);
+        //    _ttsClient = new Tts("PuGGxl9vGrdijDTBYFBhEdVx", "aGmyOET05Os0atXBxFWXsC9qf1GgXv6R");
+        //}
+        string scallid = "453";
+        string sfilepath = "E:\\callrec\\luyin\\20170508\\1004\\453_1004_173534.mp3";
+        public ActionResult GetCallOutprefix(string callid, string filepath)
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            //if (Request.IsAuthenticated)
+            //{
+            callid = scallid;
+            filepath = sfilepath;
+            _asrClient = new Asr(strAK, strSK);
+            _ttsClient = new Tts("PuGGxl9vGrdijDTBYFBhEdVx", "aGmyOET05Os0atXBxFWXsC9qf1GgXv6R");
+            Init();//(callid, filepath);
+
+
+            res = Success("音频文件转换测试", backdata);
+            // }
+            return res;
+        }
+
+
+        public void Init()//(string callid, string filepath)
+        {
+            //通过读取配置文件，获取数据库
+
+            string dbpath = Environment.CurrentDirectory + @"\Config.ini";  //指定ini文件的路径
+            dbpath = "E:\\项目\\百度语音\\语音\\代码\\ASR_Speech\\ASR_Speech\\bin\\Debug\\Config.ini";
+            Common.IniFile ini = new Common.IniFile(dbpath);
+            string _dbset = ini.IniReadValue("基础设置SQL", "Catalog");
+            string _url = ini.IniReadValue("基础设置", "服务器地址");
+            //通过读取数据库，获得URL
+            DataTable dt_Recor = DbHelperSQL.Query("select FilePath,CallId from T_Call_CallRecords where IsTranslate is NULL or IsTranslate!=1 ").Tables[0];
+            //DataTable dt_Recor = Common.SQLHelper.QueryDataTable(_dbset, "select FilePath,CallId from T_Call_CallRecords where 1=1 ", CommandType.Text, null);
+            if (dt_Recor.Rows.Count > 0)
+            {
+                int i = 0;
+                foreach (DataRow dr in dt_Recor.Rows)
+                {
+                    //录音记录id
+                    string callid = dr[1].ToString();
+                    //录音记录URL路径
+                    string filepath = dr[0].ToString();
+                    if (!string.IsNullOrEmpty(filepath))
+                    {
+                        //通过cmd执行ffmpeg改变音频采样率
+                        Process p = new Process();
+                        p.StartInfo.FileName = "cmd.exe";
+                        p.StartInfo.UseShellExecute = false;
+                        p.StartInfo.RedirectStandardOutput = true;
+                        p.StartInfo.RedirectStandardInput = true;
+                        p.StartInfo.RedirectStandardError = true;
+                        p.StartInfo.CreateNoWindow = true;
+                        //p.StartInfo.Arguments = "ffmpeg -i "+fileName+ " -ar 16000 "+ namePart + "New.wav";//参数以空格分隔，如果某个参数为空，可以传入””
+
+                        //p.Start();
+                        ////先进入cmd命令
+                        ////再打开FFmpeg.exe
+                        string ffmpegLocation = System.Threading.Thread.GetDomain().BaseDirectory;// +"bin\\";
+                        ////p.StandardInput.WriteLine("exit");
+                        //p.StandardInput.WriteLine("cd d/ " + ffmpegLocation + "ffmpeg.exe");
+                        //p.StandardInput.WriteLine(ffmpegLocation.TrimEnd('\\'));
+
+                        //判断是否存在文件夹，不存在则创建
+                        string voices_path = ffmpegLocation + "temp_voices";
+                        if (!Directory.Exists(voices_path))
+                        {
+                            Directory.CreateDirectory(voices_path);
+                        }
+                        //filepath：E:\callrec\luyin\20170506\1200\4_1200_164414.mp3
+                        string[] filepaths = filepath.Split(new char[] { '\\' });
+                        //res_audiopath：http://192.168.5.7:88/callrec/luyin/20170506/1200/4_1200_164414.mp3
+                        string res_audiopath = filepath.Replace(filepath.Substring(0, 2), _url).Replace("mp3", "wav").Replace(@"\", @"/");
+                        //voices_path：D:\项目\XFTest_WITHDB\XFTest\bin\Debug
+                        //namePart：D:\项目\XFTest_WITHDB\XFTest\bin\Debug\temp_voices\4_1200_164414.wav
+                        string namePart = voices_path + @"\" + filepaths.Last().Replace("mp3", "wav");
+                        //pcm和WAV格式文件可以解析出来
+                        //this.AsrData(p, ffmpegLocation, res_audiopath, callid, namePart);
+                        //20171013 用本地文件测试
+                        //this.AsrData(p, ffmpegLocation, ffmpegLocation + "0.mp3", callid, namePart);
+                        //20171016
+                        this.AsrData(p, ffmpegLocation, "http://192.168.5.7:88/CallREC/luyin/20170908/1/427_1_141423.wav", callid, namePart);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// 识别本地文件
+        /// </summary>
+        public void AsrData(Process p, string filelocation, string filepath, string callid, string namepart)
+        {
+            #region 读取本地文件
+            //int audiocounts = SplitAudio(filepath);
+
+            ////读取结果
+            //string rec_result = string.Empty;
+
+            ////WebClient _wClient = new WebClient();
+            ////byte[] p_pcm = _wClient.DownloadData("http://192.168.5.7:88/CallREC/luyin/20170508/1004/453_1004_173534.mp3");
+
+            ////读取远端文件是否存在
+            ////if (!RemoteFileExists("http://192.168.5.7:88/CallREC/luyin/20170908/1/427_1_141423.wav"))
+            ////    return;
+            ////ffmpeg -i http://192.168.5.7:88/callrec/luyin/20170506/1200/4_1200_164414.mp3 -f wav -ar 16000 -ac 1 -ab 16 D:\项目\XFTest_WITHDB\XFTest\bin\Debug\temp_voices\4_1200_164414.wav
+
+            //string temp_filename = filepath.Split('\\').Last().Split('.')[0] + "_temp_";
+            //Console.Write("\n开始语音听写 ...\n");
+            //for (int i = 0; i < audiocounts; i++)
+            //{
+            //    p.Start();
+            //    //先进入cmd命令
+            //    //再打开FFmpeg.exe
+
+            //    //p.StandardInput.WriteLine("exit");
+            //    p.StandardInput.WriteLine("cd d/ " + filelocation + "ffmpeg.exe");
+            //    p.StandardInput.WriteLine(filelocation.TrimEnd('\\'));
+
+            //    //p.StandardInput.WriteLine("ffmpeg -i " + temp_filename + i + ".mp3 -f pcm -ar 16000 -ac 1 -ab 16 " + namepart.Replace(@"/", @"\"));
+            //    string changefile = "ffmpeg -i " + filelocation + temp_filename + i + ".mp3 -f wav -ar 16000 -ac 1 -ab 16 " + filelocation + temp_filename + i + ".wav";
+
+            //    p.StandardInput.WriteLine(changefile);
+            //    Thread.Sleep(3000);
+            //    p.StandardInput.WriteLine("exit");
+            //    //Kill 是终止没有图形化界面的进程的唯一方法。
+            //    p.Kill();
+            //    //此处可以返回一个字符串，此例是返回压缩成功之后的一个文件路径
+            //    var data = File.ReadAllBytes(filelocation + temp_filename + i + ".wav");
+            //    var result_Json = _asrClient.Recognize(data, "wav", 16000);
+            //    if (rec_result != null)
+            //    {
+            //        int _code = int.Parse(result_Json["err_no"].ToString());
+            //        if (_code == 0)
+            //        {
+            //            string _res = result_Json["result"].ToString();
+            //            rec_result += _res.TrimStart('[').TrimEnd(']');
+            //        }
+            //        else
+            //        {
+            //            string _msg = result_Json["err_msg"].ToString();
+            //            rec_result += _msg;
+            //        }
+            //    }
+            //}
+
+            //Console.Write("\n语音听写结束\n");
+            //Console.Write("=============================================================\n");
+            //Console.Write(rec_result);
+            //Console.Write("\n=============================================================\n");
+            //int exe_res = Common.SQLHelper.Execute("XTZHSW_copy", "update T_Call_CallRecords set OperateObject='1',Remark='" + rec_result + "' where CallId='" + callid + "'", CommandType.Text, null);
+            //if (exe_res > 0)
+            //{
+            //    Console.WriteLine("\n数据库更新成功\n");
+            //    //操作完删除转换后的文件
+            //    if (File.Exists(filelocation + namepart.Replace(@"/", @"\")))
+            //    {
+            //        File.Delete(filelocation + namepart.Replace(@"/", @"\"));
+            //    }
+            //}
+            #endregion
+
+            #region 读取URL中的文件
+            //读取结果
+            string rec_result = string.Empty;
+            //读取远端文件是否存在
+            if (!RemoteFileExists(filepath))
+                return;
+            int audiocounts = SplitAudio(filepath);
+            string temp_filename = filepath.Split('/').Last().Split('.')[0] + "_temp_";
+            Console.Write("\n开始语音听写 ...\n");
+            for (int i = 0; i < audiocounts; i++)
+            {
+                p.Start();
+                //先进入cmd命令
+                //再打开FFmpeg.exe
+
+                //p.StandardInput.WriteLine("exit");
+                p.StandardInput.WriteLine("cd d/ " + filelocation + "ffmpeg.exe");
+                p.StandardInput.WriteLine(filelocation.TrimEnd('\\'));
+
+                //p.StandardInput.WriteLine("ffmpeg -i " + temp_filename + i + ".mp3 -f pcm -ar 16000 -ac 1 -ab 16 " + namepart.Replace(@"/", @"\"));
+                string changefile = "ffmpeg -i " + filelocation + temp_filename + i + ".wav -acodec pcm_s16le -f s16le -ar 16000 -ac 1 " + filelocation + temp_filename + i + ".pcm";
+
+                p.StandardInput.WriteLine(changefile);
+                Thread.Sleep(3000);
+                p.StandardInput.WriteLine("exit");
+                //Kill 是终止没有图形化界面的进程的唯一方法。
+                //p.Kill();
+                //此处可以返回一个字符串，此例是返回压缩成功之后的一个文件路径
+                var data = System.IO.File.ReadAllBytes(filelocation + temp_filename + i + ".pcm");
+                var result_Json = _asrClient.Recognize(data, "pcm", 16000);
+                if (rec_result != null)
+                {
+                    int _code = int.Parse(result_Json["err_no"].ToString());
+                    if (_code == 0)
+                    {
+                        string _res = result_Json["result"].ToString();
+                        rec_result += _res.TrimStart('[').TrimEnd(']');
+                    }
+                    else
+                    {
+                        string _msg = result_Json["err_msg"].ToString();
+                        rec_result += _msg;
+                    }
+                }
+            }
+            backdata = rec_result;
+            //Console.Write("\n语音听写结束\n");
+            //Console.Write("=============================================================\n");
+            //Console.Write(rec_result);
+            //Console.Write("\n=============================================================\n");
+            int exe_res = DbHelperSQL.ExecuteSql("update T_Call_CallRecords set IsTranslate=1,RecordsContent='" + rec_result + "' where CallId='" + callid + "'");
+            if (exe_res > 0)
+            {
+                //Console.WriteLine("\n数据库更新成功\n");
+                //操作完删除转换后的文件
+                string x = namepart.Replace(@"/", @"\");
+                if (System.IO.File.Exists(filelocation + namepart.Replace(@"/", @"\")))
+                {
+                    System.IO.File.Delete(filelocation + namepart.Replace(@"/", @"\"));
+                }
+            }
+            #endregion
+        }
+
+        /// <summary>
+        /// 分割音频
+        /// </summary>
+        /// <param name="filepath">音频路径</param>
+        private int SplitAudio(string filepath)
+        {
+            //获取音频时长
+            string length = "";
+            string[] sumlength;
+            int sec = 0;
+            DateTime beginTime = DateTime.Parse("00:00:00");
+            int index = 1;
+            using (Process pro = new Process())
+            {
+                pro.StartInfo.UseShellExecute = false;
+                pro.StartInfo.ErrorDialog = false;
+                pro.StartInfo.RedirectStandardError = true;
+
+                pro.StartInfo.FileName = AppDomain.CurrentDomain.BaseDirectory + "bin\\ffmpeg.exe";
+                pro.StartInfo.Arguments = " -i " + filepath;
+
+                pro.Start();
+                StreamReader errorreader = pro.StandardError;
+                pro.WaitForExit(1000);
+
+                string result = errorreader.ReadToEnd();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(result.IndexOf("Duration: ") + ("Duration: ").Length, ("00:00:00").Length);
+                    //result = "00:01:16";
+                    length = result;
+                    sumlength = length.Split(':');
+                    sec += (int.Parse(sumlength[0].ToString()) * 60 * 60 + int.Parse(sumlength[1].ToString()) * 60 + int.Parse(sumlength[2].ToString()));
+                }
+            }
+            //对音频进行分割
+            //ffmpeg -ss 00:00:00 -i input.mp4 -c copy -t 60 output.mp4
+            if (sec > 30)
+            {
+                Process p = new Process();
+                p.StartInfo.FileName = "cmd.exe";
+                p.StartInfo.UseShellExecute = false;
+                p.StartInfo.RedirectStandardOutput = true;
+                p.StartInfo.RedirectStandardInput = true;
+                p.StartInfo.RedirectStandardError = true;
+                // p.StartInfo.CreateNoWindow = true;
+                p.Start();
+                string ffmpegLocation = System.Threading.Thread.GetDomain().BaseDirectory + "bin\\";
+                p.StandardInput.WriteLine("exit");
+                p.StandardInput.WriteLine("cd d/ " + ffmpegLocation + "ffmpeg.exe");
+                p.StandardInput.WriteLine(ffmpegLocation.TrimEnd('\\'));
+                string fileName = System.IO.Path.GetFileName(filepath).Split('.')[0];
+                index = sec / 28 + 1;
+
+                for (int i = 0; i < index; i++)
+                {
+                    string splitstr = "ffmpeg -i " + filepath + " -ss " + beginTime.ToLongTimeString() + " -t 28 -acodec copy " + ffmpegLocation + fileName + "_temp_" + i + "." + System.IO.Path.GetFileName(filepath).Split('.')[1];
+                    p.StandardInput.WriteLine(splitstr);
+                    beginTime = beginTime.AddSeconds(29);
+                    Thread.Sleep(3000);
+                }
+                p.StandardInput.WriteLine("exit");
+                //Kill 是终止没有图形化界面的进程的唯一方法。
+                //p.Kill();
+            }
+            return index;
+        }
+
+        /// <summary>  
+        /// 判断远程文件是否存在  
+        /// </summary>  
+        /// <param name="fileUrl"></param>  
+        /// <returns></returns>  
+        public static bool RemoteFileExists(string fileUrl)
+        {
+            HttpWebRequest re = null;
+            HttpWebResponse res = null;
+            try
+            {
+                re = (HttpWebRequest)WebRequest.Create(fileUrl);
+                res = (HttpWebResponse)re.GetResponse();
+                if (res.ContentLength != 0)
+                {
+                    //MessageBox.Show("文件存在");  
+                    return true;
+                }
+            }
+            catch (Exception)
+            {
+                //MessageBox.Show("无此文件");  
+                return false;
+            }
+            finally
+            {
+                if (re != null)
+                {
+                    re.Abort();//销毁关闭连接  
+                }
+                if (res != null)
+                {
+                    res.Close();//销毁关闭响应  
+                }
+            }
+            return false;
+        }
+    }
+}

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -243,70 +243,70 @@ namespace CallCenterApi.Interface.Controllers.callout
                 if (taskId > 0)
                 {
                     // return Success("添加成功", i);
-                        model.TaskID = taskId;
-                        DataTable dt = taskTellNumBLL.GetTableDesign();
-                        switch (input.ImportType)
-                        {
-                            case 1: //从文本文件导入
-                                var file = Request.Files[0];
-                                using (StreamReader sr = new StreamReader(file.InputStream))
-                                {
-                                    String line;
-                                    while ((line = sr.ReadLine()) != null)
-                                    {
-                                        var row = dt.NewRow();
-                                        row["F_TaskId"] = model.TaskID;
-                                        row["F_Phone"] = line.ToString();
-                                        dt.Rows.Add(row);
-                                    }
-                                }
-                                break;
-                            case 2: //从文本框中导入
-                                if (string.IsNullOrWhiteSpace(input.PhoneList))
-                                    return Error("号码不可以为空");
-                                var arr = input.PhoneList.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
-                                foreach (var p in arr)
-                                {
-                                    var row = dt.NewRow();
-                                    row["F_TaskId"] = model.TaskID;
-                                    row["F_Phone"] = p;
-                                    dt.Rows.Add(row);
-                                }
-                                break;
-                            case 3: //从号码段导入
-                                if (string.IsNullOrWhiteSpace(input.PhoneStr))
-                                    return Error("号码不可以为空");
-                                double phoneInt = 0;
-                                if (!double.TryParse(input.PhoneStr, out phoneInt))
-                                    return Error("请输入正确的手机号码段");
-                                phoneInt = phoneInt * 10000;
-                                for (int i = 1; i < 10000; i++)
+                    model.TaskID = taskId;
+                    DataTable dt = taskTellNumBLL.GetTableDesign();
+                    switch (input.ImportType)
+                    {
+                        case 1: //从文本文件导入
+                            var file = Request.Files[0];
+                            using (StreamReader sr = new StreamReader(file.InputStream))
+                            {
+                                String line;
+                                while ((line = sr.ReadLine()) != null)
                                 {
                                     var row = dt.NewRow();
                                     row["F_TaskId"] = model.TaskID;
-                                    row["F_Phone"] = phoneInt + i;
+                                    row["F_Phone"] = line.ToString();
                                     dt.Rows.Add(row);
                                 }
-                                break;
-                            case 4: //从Excel中导入
-                                NPOIHelper npoi = new NPOIHelper();
-                                var dtExcel = npoi.ExcelToTable(input.PhoneStr, 1);
-                                break;
-                        }
-                        if (input.CheckFilter1)
-                        {
-                            PhoneNumFilter(dt);
-                        }
-                        if (input.CheckFilter2)
-                        {
-                            PhoneNumFilterMonth(dt);
-                        }
-                        taskTellNumBLL.SqlBulkCopy(dt);
+                            }
+                            break;
+                        case 2: //从文本框中导入
+                            if (string.IsNullOrWhiteSpace(input.PhoneList))
+                                return Error("号码不可以为空");
+                            var arr = input.PhoneList.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                            foreach (var p in arr)
+                            {
+                                var row = dt.NewRow();
+                                row["F_TaskId"] = model.TaskID;
+                                row["F_Phone"] = p;
+                                dt.Rows.Add(row);
+                            }
+                            break;
+                        case 3: //从号码段导入
+                            if (string.IsNullOrWhiteSpace(input.PhoneStr))
+                                return Error("号码不可以为空");
+                            double phoneInt = 0;
+                            if (!double.TryParse(input.PhoneStr, out phoneInt))
+                                return Error("请输入正确的手机号码段");
+                            phoneInt = phoneInt * 10000;
+                            for (int i = 1; i < 10000; i++)
+                            {
+                                var row = dt.NewRow();
+                                row["F_TaskId"] = model.TaskID;
+                                row["F_Phone"] = phoneInt + i;
+                                dt.Rows.Add(row);
+                            }
+                            break;
+                        case 4: //从Excel中导入
+                            NPOIHelper npoi = new NPOIHelper();
+                            var dtExcel = npoi.ExcelToTable(input.PhoneStr, 1);
+                            break;
+                    }
+                    if (input.CheckFilter1)
+                    {
+                        PhoneNumFilter(dt);
+                    }
+                    if (input.CheckFilter2)
+                    {
+                        PhoneNumFilterMonth(dt);
+                    }
+                    taskTellNumBLL.SqlBulkCopy(dt);
 
-                        model.y_HMCount = dt.Rows.Count;
-                        if (taskBLL.Update(model))
-                            return Success("添加成功");
-                        return Error("添加失败");
+                    model.y_HMCount = dt.Rows.Count;
+                    if (taskBLL.Update(model))
+                        return Success("添加成功");
+                    return Error("添加失败");
                 }
                 return Error("添加失败");
             }
@@ -376,65 +376,65 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <returns></returns>
         public ActionResult ImportData(ImportDataInput input)
         {
-                DataTable dt = taskTellNumBLL.GetTableDesign();
-                switch (input.Type)
-                {
-                    case 1: //从文本文件导入
-                        var file = Request.Files[0];
-                        using (StreamReader sr = new StreamReader(file.InputStream))
-                        {
-                            String line;
-                            while ((line = sr.ReadLine()) != null)
-                            {
-                                var row = dt.NewRow();
-                                row["F_TaskId"] = input.TaskId;
-                                row["F_Phone"] = line.ToString();
-                                dt.Rows.Add(row);
-                            }
-                        }
-                        break;
-                    case 2: //从文本框中导入
-                        if (string.IsNullOrWhiteSpace(input.PhoneStr))
-                            return Error("号码不可以为空");
-                        var arr = input.PhoneStr.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
-                        foreach (var p in arr)
-                        {
-                            var row = dt.NewRow();
-                            row["F_TaskId"] = input.TaskId;
-                            row["F_Phone"] = p;
-                            dt.Rows.Add(row);
-                        }
-                        break;
-                    case 3: //从号码段导入
-                        if (string.IsNullOrWhiteSpace(input.PhoneStr))
-                            return Error("号码不可以为空");
-                        double phoneInt = 0;
-                        if (!double.TryParse(input.PhoneStr, out phoneInt))
-                            return Error("请输入正确的手机号码段");
-                        phoneInt = phoneInt * 10000;
-                        for (int i = 1; i < 10000; i++)
+            DataTable dt = taskTellNumBLL.GetTableDesign();
+            switch (input.Type)
+            {
+                case 1: //从文本文件导入
+                    var file = Request.Files[0];
+                    using (StreamReader sr = new StreamReader(file.InputStream))
+                    {
+                        String line;
+                        while ((line = sr.ReadLine()) != null)
                         {
                             var row = dt.NewRow();
                             row["F_TaskId"] = input.TaskId;
-                            row["F_Phone"] = phoneInt + i;
+                            row["F_Phone"] = line.ToString();
                             dt.Rows.Add(row);
                         }
-                        break;
-                    case 4: //从Excel中导入
-                        NPOIHelper npoi = new NPOIHelper();
-                        var dtExcel = npoi.ExcelToTable(input.PhoneStr, 1);
-                        break;
-                }
-                if (input.CheckFilter1)
-                {
-                    PhoneNumFilter(dt);
-                }
-                if (input.CheckFilter2)
-                {
-                    PhoneNumFilterMonth(dt);
-                }
-                taskTellNumBLL.SqlBulkCopy(dt);
-                return Content("<script type='javascript/text'>alert('啊啊啊');</script>");
+                    }
+                    break;
+                case 2: //从文本框中导入
+                    if (string.IsNullOrWhiteSpace(input.PhoneStr))
+                        return Error("号码不可以为空");
+                    var arr = input.PhoneStr.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (var p in arr)
+                    {
+                        var row = dt.NewRow();
+                        row["F_TaskId"] = input.TaskId;
+                        row["F_Phone"] = p;
+                        dt.Rows.Add(row);
+                    }
+                    break;
+                case 3: //从号码段导入
+                    if (string.IsNullOrWhiteSpace(input.PhoneStr))
+                        return Error("号码不可以为空");
+                    double phoneInt = 0;
+                    if (!double.TryParse(input.PhoneStr, out phoneInt))
+                        return Error("请输入正确的手机号码段");
+                    phoneInt = phoneInt * 10000;
+                    for (int i = 1; i < 10000; i++)
+                    {
+                        var row = dt.NewRow();
+                        row["F_TaskId"] = input.TaskId;
+                        row["F_Phone"] = phoneInt + i;
+                        dt.Rows.Add(row);
+                    }
+                    break;
+                case 4: //从Excel中导入
+                    NPOIHelper npoi = new NPOIHelper();
+                    var dtExcel = npoi.ExcelToTable(input.PhoneStr, 1);
+                    break;
+            }
+            if (input.CheckFilter1)
+            {
+                PhoneNumFilter(dt);
+            }
+            if (input.CheckFilter2)
+            {
+                PhoneNumFilterMonth(dt);
+            }
+            taskTellNumBLL.SqlBulkCopy(dt);
+            return Content("<script type='javascript/text'>alert('啊啊啊');</script>");
 
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -169,7 +169,9 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (userModel == null)
                 return Error("获取失败，该客户信息不存在");
             //系统列+自定义列 实体
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
+            var columnList = customerFieldBLL.GetList()
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
             //系统列+自定义列 字符串
             var headList = columnList.Select(x => x.F_Name).ToList();
             //系统列+自定义列 字段名
@@ -180,7 +182,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             var expand = DbHelperSQL.Query("select  top 1 * from T_Cus_CustomerExpand where F_CustomerId=@F_CustomerId", new SqlParameter("@F_CustomerId", userModel.F_Id)).Tables[0].Rows[0];
             List<string> strList1 = new List<string>()
             {
-                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_AddAgentName, userModel.F_AddTime.ToString("yyyy-MM-dd HH:mm:ss"), userModel.F_Remark
+                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_Remark
             };
             List<string> strList2 = new List<string>();
             foreach (var item in customerColumnArr)
@@ -362,14 +364,12 @@ namespace CallCenterApi.Interface.Controllers.customer
             return Error("获取参数失败");
         }
 
-        /// <summary>
-        /// 获取自定义字段的字段名和字符串
-        /// </summary>
-        /// <returns></returns>
         public ActionResult GetCustomerField()
         {
             //系统列+自定义列 实体
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
+            var columnList = customerFieldBLL.GetList()
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
             //系统列+自定义列 字符串
             var headList = columnList.Select(x => x.F_Name).ToList();
             //系统列+自定义列 字段名

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

@@ -1,9 +1,11 @@
 using CallCenter.Utility;
 using CallCenterApi.Common;
+using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -12,6 +14,12 @@ namespace CallCenterApi.Interface.Controllers.tel
 {
     public class CallInScreenController : BaseController
     {
+
+        private readonly BLL.T_Cus_CustomerBase customerBaseBLL = new BLL.T_Cus_CustomerBase();
+        private readonly BLL.T_Cus_CustomerField customerFieldBLL = new BLL.T_Cus_CustomerField();
+        private readonly BLL.T_Cus_CustomerExpand customerExpandBLL = new BLL.T_Cus_CustomerExpand();
+        private readonly BLL.T_RepositoryInformation knowledgeBLL = new BLL.T_RepositoryInformation();
+        private readonly BLL.T_Sys_Department deptBLL = new BLL.T_Sys_Department();
         /// <summary>
         /// 添加黑名单
         /// </summary>
@@ -21,63 +29,63 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    int userId = CurrentUser.UserData.F_UserId;
-                    if (userId != 0)
+
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
                     {
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                        if (ua != null)
+                        string tel = HttpUtility.UrlDecode(RequestString.GetFormString("tel"));
+                        string callid = HttpUtility.UrlDecode(RequestString.GetFormString("callid"));
+                        int n = RequestString.GetInt("num", 0);
+                        int type = RequestString.GetInt("type", 0);
+                        Model.T_Call_Blacklist dModel = new BLL.T_Call_Blacklist().GetModelList(" F_TelPhone='" + tel + "' ").FirstOrDefault();
+
+                        var date = DateTime.Now;
+                        var enddate = date;
+                        switch (type)
+                        {
+                            case 1: enddate = enddate.AddDays(n); break;
+                            case 2: enddate = enddate.AddHours(n); break;
+                            case 3: enddate = enddate.AddMinutes(n); break;
+                            case 4: enddate = DateTime.MaxValue; break;
+                        }
+                        if (dModel == null)
                         {
-                            string tel = HttpUtility.UrlDecode(RequestString.GetFormString("tel"));
-                            string callid = HttpUtility.UrlDecode(RequestString.GetFormString("callid"));
-                            int n = RequestString.GetInt("num", 0);
-                            int type = RequestString.GetInt("type", 0);
-                            Model.T_Call_Blacklist dModel = new BLL.T_Call_Blacklist().GetModelList(" F_TelPhone='" + tel + "' ").FirstOrDefault();
-
-                            var date = DateTime.Now;
-                            var enddate = date;
-                            switch (type)
+                            dModel = new Model.T_Call_Blacklist();
+                            dModel.F_CallId = callid;
+                            dModel.F_TelPhone = tel.Trim();
+                            dModel.F_SetTime = date;
+                            dModel.F_RemoveTime = enddate;
+                            dModel.F_InterceptNum = 1;
+                            dModel.F_UserId = ua.F_UserId;
+                            int b = new BLL.T_Call_Blacklist().Add(dModel);
+                            if (b > 0)
                             {
-                                case 1: enddate = enddate.AddDays(n); break;
-                                case 2: enddate = enddate.AddHours(n); break;
-                                case 3: enddate = enddate.AddMinutes(n); break;
-                                case 4: enddate = DateTime.MaxValue; break;
+                                res = Success("添加成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
                             }
-                            if (dModel == null)
+                            else
                             {
-                                dModel = new Model.T_Call_Blacklist();
-                                dModel.F_CallId = callid;
-                                dModel.F_TelPhone = tel.Trim();
-                                dModel.F_SetTime = date;
-                                dModel.F_RemoveTime = enddate;
-                                dModel.F_InterceptNum = 1;
-                                dModel.F_UserId = ua.F_UserId;
-                                int b = new BLL.T_Call_Blacklist().Add(dModel);
-                                if (b > 0)
-                                {
-                                    res = Success("添加成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
-                                }
-                                else
-                                {
-                                    res = Error("添加失败");
-                                }
+                                res = Error("添加失败");
+                            }
+                        }
+                        else
+                        {
+
+                            dModel.F_RemoveTime = enddate;
+                            if (new BLL.T_Call_Blacklist().Update(dModel))
+                            {
+                                res = Success("修改成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
                             }
                             else
                             {
-
-                                dModel.F_RemoveTime = enddate;
-                                if (new BLL.T_Call_Blacklist().Update(dModel))
-                                {
-                                    res = Success("修改成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
-                                }
-                                else
-                                {
-                                    res = Error("修改失败");
-                                }
+                                res = Error("修改失败");
                             }
                         }
                     }
-              
+                }
+
             }
             return res;
         }
@@ -112,21 +120,66 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// 根据来电号码获取客户信息
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetCustomerByTel()
+        public ActionResult GetCustomerByTel(string tel)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
-            {
-                DataTable dt = new DataTable();
+            //ActionResult res = NoToken("未知错误，请重新登录");
+            //if (Request.IsAuthenticated)
+            //{
+            //    DataTable dt = new DataTable();
 
-                string tel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
-                BLL.T_Cus_CustomerBase bll = new BLL.T_Cus_CustomerBase();
-                dt = bll.GetList(" F_Telephone like '%" + tel + "%' or F_Mobile like '%" + tel + "%' ").Tables[0];
+            //    string tel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
+            //    BLL.T_Cus_CustomerBase bll = new BLL.T_Cus_CustomerBase();
+            //    dt = bll.GetList(" F_Telephone like '%" + tel + "%' or F_Mobile like '%" + tel + "%' ").Tables[0];
+
+            //    res = Success("客户信息加载成功", dt);
+
+            //}
+            //return res;
 
-                res = Success("客户信息加载成功", dt);
 
+
+            if (string.IsNullOrWhiteSpace(tel))
+                return Error("来电号码为空");
+
+            //系统列+自定义列 实体
+            var columnList = customerFieldBLL.GetList()
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
+            //系统列+自定义列 字符串
+            var headList = columnList.Select(x => x.F_Name).ToList();
+            //系统列+自定义列 字段名
+            var nameList = columnList.Select(x => x.F_DBFieldName).ToList();
+
+            var userModel = customerBaseBLL.GetModelByTel(tel);
+            if (userModel == null)
+                return Success("获取成功", new
+                {
+                    namelist = nameList,
+                    headlist = headList
+                });
+
+            //自定义列字段名
+            var customerColumnArr = columnList.Where(x => x.F_FieldType == 1).Select(x => x.F_DBFieldName).ToList();
+            //自定义列值
+            var expand = DbHelperSQL.Query("select  top 1 * from T_Cus_CustomerExpand where F_CustomerId=@F_CustomerId", new SqlParameter("@F_CustomerId", userModel.F_Id)).Tables[0].Rows[0];
+            List<string> strList1 = new List<string>()
+            {
+                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_Remark
+            };
+            List<string> strList2 = new List<string>();
+            foreach (var item in customerColumnArr)
+            {
+                strList2.Add(expand[item].ToString());
             }
-            return res;
+            strList1.AddRange(strList2);
+
+            return Success("获取成功", new
+            {
+                id = userModel.F_Id,
+                namelist = nameList,
+                headlist = headList,
+                datalist = strList1
+            });
         }
 
         /// <summary>
@@ -184,7 +237,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 if (tel.Trim().Length == 11 && tel.Substring(0, 1) != "0")
                 {
                     BLL.T_Sys_MobileData mobile_Bll = new BLL.T_Sys_MobileData();
-                    Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(0, 7) + "' ").FirstOrDefault(); 
+                    Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(0, 7) + "' ").FirstOrDefault();
 
                     if (mobileModel != null)
                     {
@@ -293,17 +346,17 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                 }
 
-                int hrcount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=0 "+ sqlcount);
-                int hccount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=1 "+ sqlcount);
-                
+                int hrcount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=0 " + sqlcount);
+                int hccount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=1 " + sqlcount);
+
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
                     rows = dt,
                     total = recordCount,
-                    hrcount=hrcount,
-                    hccount=hccount,
+                    hrcount = hrcount,
+                    hccount = hccount,
                 };
 
                 res = Content(obj.ToJson());
@@ -354,34 +407,34 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-               
-                    int userId = CurrentUser.UserData.F_UserId;
-                    if (userId != 0)
+
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
                     {
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                        if (ua != null)
-                        {
-                            Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
-                            model.CallId = RequestString.GetFormString("callid");
-                            model.UserId = ua.F_UserId;
-                            model.UserCode = ua.F_UserCode;
-                            model.UserName = ua.F_UserName;
+                        Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
+                        model.CallId = RequestString.GetFormString("callid");
+                        model.UserId = ua.F_UserId;
+                        model.UserCode = ua.F_UserCode;
+                        model.UserName = ua.F_UserName;
                         //model.ExtNumber = ua.F_WorkNumber;
                         model.ExtNumber = CurrentUser.UserData.F_ExtensionNumber;
 
-                            model.DealType = 5;
-                            bool bl = new BLL.T_Call_CallRecords().UpdateCallInRingTelRecord(model);
-                            if (bl)
-                            {
-                                res = Success("更新振铃状态成功");
-                            }
-                            else
-                            {
-                                res = Error("更新振铃状态失败");
-                            }
+                        model.DealType = 5;
+                        bool bl = new BLL.T_Call_CallRecords().UpdateCallInRingTelRecord(model);
+                        if (bl)
+                        {
+                            res = Success("更新振铃状态成功");
+                        }
+                        else
+                        {
+                            res = Error("更新振铃状态失败");
                         }
                     }
-            
+                }
+
             }
             return res;
         }