后端代码

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.IRepositories/ImsgonlineRepository.cs

@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.Text;
 using MadRunFabric.Common;
-using MadRunFabric.Model.OnlineServiceApi;
+using MadRunFabric.Model.TestUserTypeApi;
 
 namespace TestUserTypeApi.IRepositories
 {
    public  interface ImsgonlineRepository : IRepository<T_Msg_Chat, string>
     {
+        IEnumerable<object> GetList(int pageindex, int pagesize, int isread, out int recordCount);
     }
 }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Model/Dto/T_Msg_Chat.cs

@@ -22,16 +22,25 @@ namespace TestUserTypeApi.Model.Dto
         /// <summary>
         /// 消息来源
         /// </summary>
-        public int fromuserid { get; set; }
+        public string  fromuserid { get; set; }
 
         /// <summary>
         /// 消息发送给谁
         /// </summary>
-        public int touserid { get; set; }
+        public string  touserid { get; set; }
 
         /// <summary>
         /// 是否删除
         /// </summary>
         public int isdelete { get; set; }
+        /// <summary>
+        /// 区分微信接口和网站接口
+        /// </summary>
+
+        public int isonetype { get; set; }
+        /// <summary>
+        /// 是否查看过 0未查看 1查看过
+        /// </summary>
+        public int isread { get; set; }
     }
 }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Model/Dto/T_Msg_Chat_Map.cs

@@ -33,5 +33,6 @@ namespace TestUserTypeApi.Model.Dto
         /// 是否删除
         /// </summary>
         public int isdelete { get; set; }
+
     }
 }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Model/Dto/TestPagerDto.cs

@@ -23,6 +23,12 @@ namespace TestUserTypeApi.Model.Dto
         /// 题目选项
         /// </summary>
         public string testoptions { get; set; }
+
+        /// <summary>
+        /// 题目类型
+        /// </summary>
+        public string tesquestionType { get; set; }
+
         /// <summary>
         /// 参考答案
         /// </summary>

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Repositories/msgonlineRepository.cs

@@ -3,22 +3,53 @@ using System.Collections.Generic;
 using System.Text;
 using MadRunFabric.Common;
 using MadRunFabric.Common.Options;
-using MadRunFabric.Model.OnlineServiceApi;
+using MadRunFabric.Model.TestUserTypeApi;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MongoDB.Driver;
-
+using TestUserTypeApi.IRepositories;
+using System.Linq;
 
 namespace TestUserTypeApi.Repositories
 {
-   public  class msgonlineRepository : BaseRepository<T_Msg_Chat, string>, IRepositories.ImsgonlineRepository
+   public  class msgonlineRepository : BaseRepository<T_Msg_Chat, string>, ImsgonlineRepository
     {
         protected readonly ILogger<BaseRepository<T_Msg_Chat, string>> _logger;
-        protected readonly IMongoCollection<T_Msg_Chat> _collection_MassageInfo;
+        protected readonly IMongoCollection<T_Msg_Chat> _collection_T_Msg_Chat;
+        protected readonly IMongoCollection<T_Msg_Chat_Map> _collection_T_Msg_Chat_Map;
         public msgonlineRepository(IOptions<MongodbOptions> settings, ILogger<BaseRepository<T_Msg_Chat, string>> logger) : base(settings, logger)
         {
-            _collection_MassageInfo = _context.GetCollection<T_Msg_Chat>();
+            _collection_T_Msg_Chat_Map = _context.GetCollection<T_Msg_Chat_Map>();
+            _collection_T_Msg_Chat = _context.GetCollection<T_Msg_Chat>();
             _logger = logger;
         }
+       
+        public IEnumerable<object> GetList(int pageindex, int pagesize, int isread, out int recordCount)
+        {
+            var query =
+                 from chat in _collection.AsQueryable()
+                 join chatmap in _collection_T_Msg_Chat_Map.AsQueryable() on chat.id equals chatmap.chatid into chatDefa
+                 where chat.isdelete == 0
+                 select new TestUserTypeApi.Model.Dto.T_Msg_Chat
+                 {
+                     id = chat.id,
+                     Msgcontent = chat.Msgcontent,
+                     fromuserid = chat.fromuserid,//消息来源
+                     touserid   = chat.touserid,//发送给谁
+                     isonetype  = chat.isonetype,//1是微信接口进入的
+                     isdelete   = chat.isdelete,
+                     createtime  = chat.createtime,
+                     isread      = chatDefa != null && chatDefa.Count() > 0 ? chatDefa.First().isread : 0
+                 };
+            #region 查询条件
+            if (!string.IsNullOrEmpty(isread.ToString()))
+                query = query.Where(it => it.isread == isread);
+            query = query.Where(it => it.isread == 0);
+            #endregion
+            //var list = query.OrderByDescending(it => it.createtime);
+            recordCount = query.Count();
+            var list = query.Skip((pageindex - 1) * pagesize).Take(pagesize);
+            return list;
+        }
     }
 }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Repositories/msgonlinemapRepository.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using MadRunFabric.Common;
 using MadRunFabric.Common.Options;
-using MadRunFabric.Model.OnlineServiceApi;
+using MadRunFabric.Model.TestUserTypeApi;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MongoDB.Driver;

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Controllers/TestUserTypeController.cs

@@ -21,7 +21,8 @@ using System.ServiceModel;
 using System.Collections;
 using System.Net.Http;
 using System.Reflection;
-using MadRunFabric.Model.OnlineServiceApi;
+using com.pkuhit.iihip.sdk;
+using com.pkuhit.iihip.sdk.message;
 
 // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -101,7 +102,7 @@ namespace TestUserTypeApi.Controllers
             //    list = await _tsertuserRepository.Get(s => s.testtype == testtypeid);
             //}
             //排序字段
-            var sort = Builders<TestPager>.Sort.Descending("createdatatime");
+            var sort = Builders<TestPager>.Sort.Ascending("testcode");
             //根据条件查询集合
             var listApp = new List<FilterDefinition<TestPager>>();
             listApp.Add(Builders<TestPager>.Filter.Eq("isdelete", 0));
@@ -138,7 +139,14 @@ namespace TestUserTypeApi.Controllers
                 model.testcode = item.testcode;
                 model.testoptions = optioncenter;
                 model.testtype = item.testtype;
-                model.testtypename = ttps.Typename;
+                if (ttps != null)
+                {
+                    model.testtypename = ttps.Typename;
+                }
+                else
+                {
+                    model.testtypename = "";
+                }
                 //model.tesquestid = model.tesquestid;//选项编号
                 model.isdelete = item.isdelete;
                 listmodel.Add(model);
@@ -159,7 +167,7 @@ namespace TestUserTypeApi.Controllers
         {
 
             //排序字段
-            var sort = Builders<TestPager>.Sort.Descending("createdatatime");
+            var sort = Builders<TestPager>.Sort.Ascending("testcode");
             //根据条件查询集合
             var listApp = new List<FilterDefinition<TestPager>>();
             listApp.Add(Builders<TestPager>.Filter.Eq("isdelete", 0));
@@ -185,7 +193,11 @@ namespace TestUserTypeApi.Controllers
                 model.testcode = item.testcode;
                 model.optionlists = tqn;//选项集合信息
                 model.testtype = item.testtype;
-                model.testtypename = ttps.Typename;
+                if (ttps != null)
+                {
+                    model.testtypename = ttps.Typename;
+                }
+                
                 //model.tesquestid = model.tesquestid;//选项编号
                 model.isdelete = item.isdelete;
                 listmodel.Add(model);
@@ -462,7 +474,11 @@ namespace TestUserTypeApi.Controllers
                 model.id = item.id;
                 model.telcode = item.telcode;//电话号
                 model.testid = item.testid;//试卷表id
-                model.testname = tpser.testtitle;//试题名称
+                if (tpser != null)
+                {
+                    model.testname = tpser.testtitle;//试题名称
+                }
+                
                 model.testoptions = item.testoptions;//选项
                 model.grade = item.grade;//得分
                 model.testtype = item.testtype;//试卷类型
@@ -582,7 +598,11 @@ namespace TestUserTypeApi.Controllers
                 model.testcount = item.testcount;//答题数量
                 model.allgrade = item.allgrade;//总分数
                 model.testtype = item.testtype;//试卷类型
-                model.testtypename = ttps.Typename;//试卷类型名称
+                if (ttps != null)
+                {
+                    model.testtypename = ttps.Typename;//试卷类型名称
+                }
+               
                                                    // model.testid = item.testid;//问题id
 
                 listmodel.Add(model);
@@ -713,7 +733,18 @@ namespace TestUserTypeApi.Controllers
         {
             var model = await _ItestquestionRepository.Get(p => p.testid == testid);
             return Success("成功", model);
-        } 
+        }
+
+        /// <summary>
+        /// 根据id获取详情信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("gettestquestinfobyid")]
+        public async Task<IActionResult> Gettestquestinfobyid(string id)
+        {
+            var model = await _ItestquestionRepository.Get(p => p.id == id);
+            return Success("成功", model);
+        }
         #endregion
         #region 短信模块
         /// <summary>
@@ -906,50 +937,56 @@ namespace TestUserTypeApi.Controllers
             var str = tps.sendcenter;// "您好 ！感谢您对我们医院的新人月支持请对我们的服质量给予评价1 满意；2不满意；3 表扬，回复数字即可。谢谢！顺祝生活愉快【郑州市第一人民医院】";//您好 ！感谢您对我们医院的新人月支持请对我们的服质量给予评价1 满意；2不满意；3 表扬，回复数字即可。谢谢！顺祝生活愉快  
             //发送给哪个手机号
             var Mobile = tps.telcode;
-            //定时发送还是立即发送
-            var SendTime = tps.SendTime;
-            string result1 = HttpUtility.UrlEncode(str, Encoding.GetEncoding("GB2312"));
-            var ifsend = false;
-            var aaa = " ";
-            string url = "https://sdk2.028lk.com/sdk2/BatchSend2.aspx?CorpID=DYRMYY011170&Pwd=xxk@80188&Mobile=" + Mobile + "&Content=" + result1 + "&Cell=&SendTime=";
-
-            //?CorpID=DYRMYY011170&Pwd=xxk@80188&Mobile=13935966971&Content="+ result1 + "&Cell=&SendTime=
-
-            //Encoding encoding = Encoding.GetEncoding("GB2312");
-            //Encoding encoding = Encoding.GetEncoding("UTF-8");
-            Encoding encoding = Encoding.GetEncoding("GBK");
-            IDictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters.Add("CorpID", "DYRMYY011170");
-            parameters.Add("Pwd", "xxk@80188");
-            parameters.Add("Mobile", Mobile);
-            parameters.Add("Content", result1);
-            parameters.Add("Cell", "");
-            parameters.Add("SendTime", SendTime.ToString());
-            HttpWebResponse response = PostHttps(url, parameters, encoding);
-            //打印返回值
-            Stream stream = response.GetResponseStream();   //获取响应的字符串流
-            StreamReader sr = new StreamReader(stream); //创建一个stream读取流
-
-            //返回的信息
-            string html = sr.ReadToEnd();
-
+            ////定时发送还是立即发送
+            //var SendTime = tps.SendTime;
+            //string result1 = HttpUtility.UrlEncode(str, Encoding.GetEncoding("GB2312"));
+            //var ifsend = false;
+            //var aaa = " ";
+            //string url = "https://sdk2.028lk.com/sdk2/BatchSend2.aspx?CorpID=DYRMYY011170&Pwd=xxk@80188&Mobile=" + Mobile + "&Content=" + result1 + "&Cell=&SendTime=";
+
+            ////?CorpID=DYRMYY011170&Pwd=xxk@80188&Mobile=13935966971&Content="+ result1 + "&Cell=&SendTime=
+
+            ////Encoding encoding = Encoding.GetEncoding("GB2312");
+            ////Encoding encoding = Encoding.GetEncoding("UTF-8");
+            //Encoding encoding = Encoding.GetEncoding("GBK");
+            //IDictionary<string, string> parameters = new Dictionary<string, string>();
+            //parameters.Add("CorpID", "DYRMYY011170");
+            //parameters.Add("Pwd", "xxk@80188");
+            //parameters.Add("Mobile", Mobile);
+            //parameters.Add("Content", result1);
+            //parameters.Add("Cell", "");
+            //parameters.Add("SendTime", SendTime.ToString());
+            //HttpWebResponse response = PostHttps(url, parameters, encoding);
+            ////打印返回值
+            //Stream stream = response.GetResponseStream();   //获取响应的字符串流
+            //StreamReader sr = new StreamReader(stream); //创建一个stream读取流
+
+            ////返回的信息
+            //string html = sr.ReadToEnd();
+            string html ="2";
             if (Convert.ToInt32(html) > 0)
             {
-                MassageInfo tp = new MassageInfo();
-                tp.telcode = tps.telcode;
-                tp.sendcenter = tps.sendcenter;
-                tp.senddate = DateTime.Now;
-                tp.isdelete = 0;
-                tp.replycenter = "";
-                var a = _IMassageInfoRepository.AddRetID(tp);
-                if (a.Result != null || a.Result != "")
-                {
-                    return Success("成功", a.Result);
-                }
-                else
+                string[] arrStr = tps.sendcenter.Split(',');
+                foreach (var item in arrStr)
                 {
-                    return Error("失败");
+                    MassageInfo tp = new MassageInfo();
+
+                    tp.telcode = tps.telcode;
+                    tp.sendcenter = tps.sendcenter;
+                    tp.senddate = DateTime.Now;
+                    tp.isdelete = 0;
+                    tp.replycenter = "";
+                    var a = _IMassageInfoRepository.AddRetID(tp);
                 }
+                return Success("成功");
+                //if (a.Result != null || a.Result != "")
+                //{
+                //    return Success("成功", a.Result);
+                //}
+                //else
+                //{
+                //    return Error("失败");
+                //}
             }
             else if (Convert.ToInt32(html) == -2)
             {
@@ -1304,7 +1341,7 @@ namespace TestUserTypeApi.Controllers
             return Success("成功", obj);
         }
         /// <summary>
-        /// 添加聊天记录表信息
+        ///网站接口进入 添加聊天记录表信息
         /// </summary>
         /// <param name="tps"></param>
         /// <returns></returns>
@@ -1315,6 +1352,7 @@ namespace TestUserTypeApi.Controllers
             tp.Msgcontent = tps.Msgcontent;//信息内容
             tp.fromuserid = tps.fromuserid;//消息来源
             tp.touserid = tps.touserid;//发送给谁
+            tp.isonetype = 0;//0是网站接口进入的
             tp.isdelete = 0;
             tp.createtime = DateTime.Now;
             var a = _ImsgonlineRepository.AddRetID(tp);
@@ -1344,6 +1382,49 @@ namespace TestUserTypeApi.Controllers
             }
 
         }
+
+        /// <summary>
+        /// 微信接口进入 添加聊天记录表信息
+        /// </summary>
+        /// <param name="tps"></param>
+        /// <returns></returns>
+        [HttpGet("whataddonlineservice")]
+        public async Task<IActionResult> whatAddOnlineservice(Model.Dto.T_Msg_Chat tps)
+        {
+            T_Msg_Chat tp = new T_Msg_Chat();
+            tp.Msgcontent = tps.Msgcontent;//信息内容
+            tp.fromuserid = tps.fromuserid;//消息来源
+            tp.touserid = tps.touserid;//发送给谁
+            tp.isonetype =1;//1是微信接口进入的
+            tp.isdelete = 0;
+            tp.createtime = DateTime.Now;
+            var a = _ImsgonlineRepository.AddRetID(tp);
+            if (a.Result != null || a.Result != "")
+            {
+                T_Msg_Chat_Map tmp = new T_Msg_Chat_Map();
+                tmp.chatid = a.Result;//聊天记录的编号
+                tmp.fromuserid = tps.fromuserid;
+                tmp.touserid = tps.touserid;
+                tmp.isdelete = 0;
+                tmp.isread = 0;//是否查看过
+                tmp.createtime = DateTime.Now;
+                var b = _ImsgonlinemapRepository.AddRetID(tmp);
+                if (b.Result != null || b.Result != "")
+                {
+                    return Success("成功", a.Result);
+                }
+                else
+                {
+                    return Error("添加关联记录失败");
+                }
+
+            }
+            else
+            {
+                return Error("添加聊天记录失败");
+            }
+
+        }
         /// <summary>
         /// 根据编号获取聊天记录信息详情
         /// </summary>
@@ -1360,36 +1441,45 @@ namespace TestUserTypeApi.Controllers
             return Success("成功", model);
         }
         /// <summary>
-        /// 获取未读消息列表
+        /// 获取未读消息列表 已读消息列表  
         /// </summary>
         /// <param name="PageIndex"></param>
         /// <param name="PageSize"></param>
         /// <returns></returns>
-        [HttpGet("getListonlineservice")]
-        public async Task<IActionResult> GetListOnlineservicemap(int PageIndex, int PageSize)
+        [HttpGet("getlistonlineservicemap")]
+        public async Task<IActionResult> GetListOnlineservicemap(int PageIndex, int PageSize,int isread)
         {
-
+            var a = _ImsgonlineRepository.GetList(PageIndex, PageSize,0,out int count);
             //排序字段
-            var sort = Builders<T_Msg_Chat_Map>.Sort.Descending("createdatatime");
+            var sort = Builders<T_Msg_Chat_Map>.Sort.Ascending("createdatatime");
             //根据条件查询集合
             var listApp = new List<FilterDefinition<T_Msg_Chat_Map>>();
             listApp.Add(Builders<T_Msg_Chat_Map>.Filter.Eq("isdelete", 0));
-
+            if (isread != null)
+            {
+                listApp.Add(Builders<T_Msg_Chat_Map>.Filter.Eq("isread", isread));//未读 已读 
+            }
+            else
+            {
+                listApp.Add(Builders<T_Msg_Chat_Map>.Filter.Eq("isread", 0));//未读
+            }
             var filter = Builders<T_Msg_Chat_Map>.Filter.And(listApp);
 
             var list = await _ImsgonlinemapRepository.GetByPage(filter, PageIndex, PageSize, sort);
             var redCount = await _ImsgonlinemapRepository.CountAsync(filter);   //获取总数
-            var listmodel = new List<T_Msg_Chat_Map>();
+            var listmodel = new List<T_Msg_Chat>();
 
 
             foreach (var item in list)
             {
-                var model = new T_Msg_Chat_Map();
+                var mapmode = await _ImsgonlineRepository.GetSingle(p => p.id == item.chatid);
+                var model = new T_Msg_Chat();
                 model.id = item.id;
-                model.chatid = item.chatid;//聊天记录编号
-                model.isread = item.isread;//是否阅读
+                model.Msgcontent = mapmode.Msgcontent;//聊天内容
                 model.fromuserid = item.fromuserid;//消息来源
+
                 model.touserid = item.touserid;//发送给谁
+
                 model.createtime = item.createtime;//创建时间
                 model.isdelete = item.isdelete;//是否禁用
                 listmodel.Add(model);
@@ -1402,5 +1492,6 @@ namespace TestUserTypeApi.Controllers
             return Success("成功", obj);
         }
         #endregion
+
     }
 }