颐和报修正式没有messageaip，修改

.gitignore

@@ -0,0 +1,14 @@
+################################################################################
+# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
+################################################################################
+
+
+.vs/
+packages/
+*/obj
+*/bin
+*.png
+[Bb]in/
+[Oo]bj/
+*.pubxml
+*.user 

MadRunFabric.EquipmentApi/EquipmentApi/Controllers/workordermanage/WoRepairBaseController.cs

@@ -29,6 +29,7 @@ using com.igetui.api.openservice.igetui.template;
 using System.Data;
 using MongoDB.Driver.Core.Bindings;
 using OfficeOpenXml.FormulaParsing.Utilities;
+using EquipmentApi.Model;
 
 namespace EquipmentApi.Controllers.workordermanage
 {
@@ -6322,6 +6323,142 @@ namespace EquipmentApi.Controllers.workordermanage
             }
             return Success("成功", listbb);
         }
+        [AllowAnonymous]
+        [HttpGet("excelwxrygzllist")]
+        public async Task<IActionResult> excelwxrygzllist(string stime, string etime, string deptname, string usercode) {
+            List<Model.Dto.userdealwocode> listbb = new List<Model.Dto.userdealwocode>();
+            //获取所有维修人员信息
+            var list = _sys_user_accountRepository.GetProjectUser(deptname);
+            if (!string.IsNullOrEmpty(deptname))
+            {
+                if (!string.IsNullOrEmpty(usercode))
+                {
+                    var usermode = _sys_user_accountRepository.GetUserinfobycode(usercode, deptname);//.GetSingle(p => p.usercode == usercode);
+                    if (usermode != null)
+                    {
+                        foreach (var item in usermode)
+                        {
+                            var userinfolist = ConvertObject<MadRunFabric.Model.SignTokenApi.Model.Zxryworkcount>(item);
+                            var deptnames = userinfolist.role_name;// usermode.postlist[0];//科室名称
+                            var usernames = userinfolist.username;//维修人
+                            long tocount = 0;
+                            long dealcount = 0;
+                            tocount = _wo_repair_baseRepository.Count(p => p.touser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//接单数量
+                            dealcount = _wo_repair_baseRepository.Count(p => p.dealuser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//处理数量
+
+                            Model.Dto.userdealwocode model = new Model.Dto.userdealwocode();
+                            model.deptname = deptnames;//科室名称
+                            model.username = usernames;//维修人
+                            model.tocount = tocount.ToString();//接单量
+                            model.dealcount = dealcount.ToString();//处理量
+                            listbb.Add(model);
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (var item in list)
+                    {
+
+                        var userinfolist = ConvertObject<MadRunFabric.Model.SignTokenApi.Model.Zxryworkcount>(item);
+                        //if (userinfolist.postlist.Count == 0)
+                        //{
+                        //    continue;
+                        //}
+                        var deptnames = userinfolist.role_name;//  userinfolist.postlist[0];//科室名称
+                        //if (deptnames != deptname)
+                        //{
+                        //    continue;
+                        //}
+                        var usernames = userinfolist.username;//维修人
+                        long tocount = 0;
+                        long dealcount = 0;
+                        tocount = _wo_repair_baseRepository.Count(p => p.touser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//接单数量
+                        dealcount = _wo_repair_baseRepository.Count(p => p.dealuser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//处理数量
+
+                        Model.Dto.userdealwocode model = new Model.Dto.userdealwocode();
+                        model.deptname = deptnames;//科室名称
+                        model.username = usernames;//维修人
+                        model.tocount = tocount.ToString();//接单量
+                        model.dealcount = dealcount.ToString();//处理量
+                        listbb.Add(model);
+
+                    }
+                }
+
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(usercode))
+                {
+                    var usermode = _sys_user_accountRepository.GetUserinfobycode(usercode, deptname);
+                    if (usermode != null)
+                    {
+                        foreach (var item in usermode)
+                        {
+                            var userinfolist = ConvertObject<MadRunFabric.Model.SignTokenApi.Model.Zxryworkcount>(item);
+
+                            var deptnames = userinfolist.role_name;// usermode.postlist[0];//科室名称
+                            var usernames = userinfolist.username;//维修人
+                            long tocount = 0;
+                            long dealcount = 0;
+                            tocount = _wo_repair_baseRepository.Count(p => p.touser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//接单数量
+                            dealcount = _wo_repair_baseRepository.Count(p => p.dealuser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//处理数量
+
+                            Model.Dto.userdealwocode model = new Model.Dto.userdealwocode();
+                            model.deptname = deptnames;//科室名称
+                            model.username = usernames;//维修人
+                            model.tocount = tocount.ToString();//接单量
+                            model.dealcount = dealcount.ToString();//处理量
+                            listbb.Add(model);
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (var item in list)
+                    {
+
+                        var userinfolist = ConvertObject<MadRunFabric.Model.SignTokenApi.Model.Zxryworkcount>(item);
+                       
+                        var deptnames = userinfolist.role_name;// userinfolist.postlist[0];//科室名称
+                        var usernames = userinfolist.username;//维修人
+                        long tocount = 0;
+                        long dealcount = 0;
+                        tocount = _wo_repair_baseRepository.Count(p => p.touser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//接单数量
+                        dealcount = _wo_repair_baseRepository.Count(p => p.dealuser[0] == userinfolist.usercode && p.totime >= Convert.ToDateTime(stime + " 00:00:00") && p.totime <= Convert.ToDateTime(etime + " 23:59:59")).Result;//处理数量
+
+                        Model.Dto.userdealwocode model = new Model.Dto.userdealwocode();
+                        model.deptname = deptnames;//科室名称
+                        model.username = usernames;//维修人
+                        model.tocount = tocount.ToString();//接单量
+                        model.dealcount = dealcount.ToString();//处理量
+                        listbb.Add(model);
+
+                    }
+                }
+            }
+            NPOIHelper npoi = new NPOIHelper();
+            var tb = ModelConvertHelper<Model.Dto.userdealwocode>.ListToTable(listbb, null);
+            if (tb != null)
+            {
+                //导出dtnew 
+                string[] cols = { "科室名称", "维修人", "接单量", "处理量" };
+
+                byte[] sm = npoi.ExportToExcel1(tb, cols);
+                if (sm != null)
+                {
+                    return File(sm, "application/vnd.ms-excel", "维修人员工作量统计.xlsx");
+                }
+                else
+                {
+                    return Error("导出失败");
+                }
+            }
+            return Error("没有数据");
+        }
+
+
 
         #endregion
         #region 工单操作接口
@@ -6528,36 +6665,36 @@ namespace EquipmentApi.Controllers.workordermanage
                         //    wostatemap = dModel.wostate; // 0;
                         //    listmap = listmap.Where(x => x.wostate == 0);
                         //}
-                        if (dModel.wostate == 0 || dModel.wostate == 1)
-                        {
-                            //维修工单号
-                            var listmap = await _wo_order_user_maprepository.Get(x => x.woid == dModel.id && x.wocode == dModel.wocode && x.channelcode == channelcode && x.readby == usercode);
-                            var modelmap = listmap.FirstOrDefault();
-                            if (modelmap == null)
-                            {
-                                //添加是否已读关系表
-                                modelmap = new Wo_Order_User_Map();
-                                modelmap.woid = dModel.id;
-                                modelmap.wocode = dModel.wocode;
-                                modelmap.wostate = dModel.wostate;
-                                modelmap.readby = usercode;
-                                modelmap.channelcode = channelcode;   //工单类型（枚举EnumOrderState） 维修工单 = 1, 保养工单 = 2, 运行工单 = 3, 超时工单 = 4
-                                modelmap.isread = 1;
-                                modelmap.isnotice = 1;
-                                modelmap.readtime = DateTime.Now.ToLocalTime();
-                                modelmap.note = "故障说明:" + dModel.faultdescripe;
-                                //modelmap.note = dModel.faultdescripe;
-                                bool b = await _wo_order_user_maprepository.Add(modelmap);
-                            }
-                            else
-                            {
-                                modelmap.isread = 1;
-                                modelmap.isnotice = 1;
-                                modelmap.note = "故障说明:" + dModel.faultdescripe;
-                                // modelmap.note = dModel.faultdescripe;
-                                bool b = await _wo_order_user_maprepository.UpdateOne(modelmap);
-                            }
-                        }
+                        //if (dModel.wostate == 0 || dModel.wostate == 1)
+                        //{
+                        //    //维修工单号
+                        //    var listmap = await _wo_order_user_maprepository.Get(x => x.woid == dModel.id && x.wocode == dModel.wocode && x.channelcode == channelcode && x.readby == usercode);
+                        //    var modelmap = listmap.FirstOrDefault();
+                        //    if (modelmap == null)
+                        //    {
+                        //        //添加是否已读关系表
+                        //        modelmap = new Wo_Order_User_Map();
+                        //        modelmap.woid = dModel.id;
+                        //        modelmap.wocode = dModel.wocode;
+                        //        modelmap.wostate = dModel.wostate;
+                        //        modelmap.readby = usercode;
+                        //        modelmap.channelcode = channelcode;   //工单类型（枚举EnumOrderState） 维修工单 = 1, 保养工单 = 2, 运行工单 = 3, 超时工单 = 4
+                        //        modelmap.isread = 1;
+                        //        modelmap.isnotice = 1;
+                        //        modelmap.readtime = DateTime.Now.ToLocalTime();
+                        //        modelmap.note = "故障说明:" + dModel.faultdescripe;
+                        //        //modelmap.note = dModel.faultdescripe;
+                        //        bool b = await _wo_order_user_maprepository.Add(modelmap);
+                        //    }
+                        //    else
+                        //    {
+                        //        modelmap.isread = 1;
+                        //        modelmap.isnotice = 1;
+                        //        modelmap.note = "故障说明:" + dModel.faultdescripe;
+                        //        // modelmap.note = dModel.faultdescripe;
+                        //        bool b = await _wo_order_user_maprepository.UpdateOne(modelmap);
+                        //    }
+                        //}
                     }
                     #endregion
                     return Success("获取工单成功", obj);
@@ -6876,7 +7013,7 @@ namespace EquipmentApi.Controllers.workordermanage
                         var clintidlist1 = await _IusercoldandclintidsRepository.GetSingle(p => p.usercode == usercoudemode.usercode);
                         if (clintidlist1 != null)
                         {
-                            PushMessageToList("通知", "您有新的工单需要处理", clintidlist1.clintid);
+                           // PushMessageToList("通知", "您有新的工单需要处理", clintidlist1.clintid);
                         }
                     }
 
@@ -7076,10 +7213,10 @@ namespace EquipmentApi.Controllers.workordermanage
             {
                 return Error("请选择故障类型");
             }
-            if (string.IsNullOrWhiteSpace(detail))
-            {
-                return Error("请输入异常说明");
-            }
+            //if (string.IsNullOrWhiteSpace(detail))
+            //{
+            //    return Error("请输入异常说明");
+            //}
 
             string optuser = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             string optusername = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
@@ -7159,12 +7296,14 @@ namespace EquipmentApi.Controllers.workordermanage
                     if (state == (int)EnumWorkOrderState.deal)
                     {
                         msg = "处理";
+                        state = (int)EnumWorkOrderState.evaluate;
                         clmodel.dealtime = DateTime.Now;
                         clmodel.islosematerials = 0;
+                        clmodel.arrivetime = DateTime.Now;
                         clmodel.losematerials = new List<MaterialModel>();
                     }
 
-                    //clmodel.dealuser = dealcodes;
+                  
                     //clmodel.dealusername = dealnames;
                     clmodel.wostate = state;
                     clmodel.faulttypeid = faulttypeid;
@@ -7335,7 +7474,7 @@ namespace EquipmentApi.Controllers.workordermanage
                 await _wo_repair_sendRepository.Add(wrs);
 
                 string mobile = string.IsNullOrEmpty(userinfo.mobile) ? "" : "（" + userinfo.mobile + "）";
-                AddItems(clmodel.wocode, clmodel.wostate, channel, optuser + "-" + optusername + mobile + " 抢单", new List<FileBaseModel>(), optuser, optusername, "");
+                AddItems(clmodel.wocode, clmodel.wostate, channel, optuser + "-" + optusername + mobile + " 接收", new List<FileBaseModel>(), optuser, optusername, "");
 
                 if (clmodel.channel == 4)
                 {
@@ -7344,10 +7483,10 @@ namespace EquipmentApi.Controllers.workordermanage
                     //SendWechatMessage(clmodel.wocode, "维修人员接单！", content, clmodel.id, clmodel.createuser);
                 }
 
-                return Success("抢单成功");
+                return Success("接收成功");
             }
 
-            return Error("抢单失败");
+            return Error("接收失败");
 
         }
         /// <summary>
@@ -7658,22 +7797,54 @@ namespace EquipmentApi.Controllers.workordermanage
                 var clintidlist = await _IusercoldandclintidsRepository.GetSingle(p => p.usercode == userinfo.usercode);
                 if (clintidlist != null)
                 {
-                    PushMessageToList("通知", "您有新的工单需要处理", clintidlist.clintid);
-                }
-                var clintidlist1 = await _IusercoldandclintidsRepository.GetSingle(p => p.usercode == touserinfo.usercode);
-                if (clintidlist1 != null)
-                {
-                    PushMessageToList("通知", "您有新的工单需要处理", clintidlist1.clintid);
+                    // PushMessageToList("通知", "您有新的工单需要处理", clintidlist.clintid);
+
+
+
                 }
+                //var clintidlist1 = await _IusercoldandclintidsRepository.GetSingle(p => p.usercode == touserinfo.usercode);
+                //if (clintidlist1 != null)
+                //{
+                   // PushMessageToList("通知", "您有新的工单需要处理", clintidlist1.clintid);
+                //}
 
                 //工单信息
-                var listmap = await _wo_order_user_maprepository.Get(x => x.wocode == clmodel.wocode && x.channelcode == 1 && x.readby == assignman);
-                var modelmap = listmap.FirstOrDefault();
-                if (modelmap != null)
+                //var listmap = await _wo_order_user_maprepository.Get(x => x.wocode == clmodel.wocode && x.channelcode == 1 && x.readby == assignman);
+                //var modelmap = listmap.FirstOrDefault();
+                //if (modelmap != null)
+                //{
+                //    //删除工单关系表中对应工单
+                //    bool boo = await _wo_order_user_maprepository.Remove(modelmap.id);
+                //}
+
+
+                if (clmodel.wostate == 1 && !string.IsNullOrEmpty(assignman))
                 {
-                    //删除工单关系表中对应工单
-                    bool boo = await _wo_order_user_maprepository.Remove(modelmap.id);
+                    //维修工单号
+                    var listmap = await _wo_order_user_maprepository.Get(x => x.woid == clmodel.id && x.wocode == clmodel.wocode && x.channelcode == 1 && x.readby == assignman);
+                    var modelmap = listmap.FirstOrDefault();
+                    if (modelmap == null)
+                    {
+                        //添加是否已读关系表
+                        modelmap = new Wo_Order_User_Map();
+                        modelmap.woid = clmodel.id;
+                        modelmap.wocode = clmodel.wocode;
+                        modelmap.wostate = clmodel.wostate;
+                        modelmap.readby = assignman;
+                        modelmap.channelcode = 1;   //工单类型（枚举EnumOrderState） 维修工单 = 1, 保养工单 = 2, 运行工单 = 3, 超时工单 = 4
+                        modelmap.isread = 0;
+                        modelmap.isnotice = 0;
+                        modelmap.readtime = DateTime.Now;
+                        // modelmap.readtime = DateTime.Now.ToLocalTime();
+                        modelmap.note = "您有新的工单需要处理,工单编号：" + clmodel.wocode;// "故障说明:" + clmodel.faultdescripe;
+                        //modelmap.note = dModel.faultdescripe;
+                        bool b = await _wo_order_user_maprepository.Add(modelmap);
+                    }
+              
                 }
+
+
+
                 #endregion
                 return Success("派单成功");
             }
@@ -7923,10 +8094,11 @@ namespace EquipmentApi.Controllers.workordermanage
         /// <summary>
         /// 取消工单
         /// </summary>
+ 
         [HttpPost("cancle")]
         public async Task<IActionResult> UpdateCancleAsync(string wocode, int channel = 1)
         {
-            string optuser = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+             string optuser = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             string optusername = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
             //var userstr = _signTokenService.GetUserInfoAsync(optuser).Result;
             //var userinfo = userstr.ToJObject()["data"].ToString().ToObject<UserInfoModel>();
@@ -7937,7 +8109,7 @@ namespace EquipmentApi.Controllers.workordermanage
 
             var cls = await _wo_repair_baseRepository.Get(p => p.wocode == wocode && p.isdelete == 0);
             var clmodel = cls.FirstOrDefault();
-            if (clmodel != null && clmodel.createuser == optuser && clmodel.wostate == (int)EnumWorkOrderState.create)
+            if (clmodel != null && clmodel.createuser == optuser )
             {
                 clmodel.wostate = (int)EnumWorkOrderState.cancle;
                 clmodel.canceltime = DateTime.Now;
@@ -12157,6 +12329,105 @@ namespace EquipmentApi.Controllers.workordermanage
             return Success("成功", hcinfolist);
         }
 
+
+
+        [HttpGet("getbxmessagelist")]
+        public async Task<IActionResult> GetBxMessageList(int isread)
+        {
+            string nowusercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode == 1 && x.readby == nowusercode);
+
+            var list = new List<MessageListDto>();
+            if (isread == 0)
+            {
+                var listnoreadmaps = listmap.Where(x => x.isread == 0).OrderByDescending(x => x.readtime).Take(50);
+                foreach (var item in listnoreadmaps)
+                {
+                    list.Add(new MessageListDto
+                    {
+                        id = item.id,
+                        woid = item.woid,
+                        channelcode = 1,
+                        wotype = 1,
+                        wocode = item.wocode,
+                        proname = "维修工单:" + item.wocode, // + " " + item.proname,
+                        title = "待处理提醒",
+                        content = item.note,
+                        wostate = item.wostate,
+                        statename = "", //工单状态
+                        checkby = "",    //接单人
+                        createby = "",
+                        isread = 0,
+                    });
+                }
+            }
+            else
+            {
+                var listreadmaps = listmap.Where(x => x.isread == 1).OrderByDescending(x => x.readtime).Take(50);
+
+
+                foreach (var item in listreadmaps)
+                {
+                    list.Add(new MessageListDto
+                    {
+                        id = item.id,
+                        woid = item.id,
+                        channelcode = 1,
+                        wotype = 1,
+                        wocode = item.wocode,
+                        proname = "维修工单:" + item.wocode, // + " " + item.proname,
+                        title = item.wocode,
+                        content = item.note,
+                        wostate = item.wostate,
+                        statename = "", //工单状态
+                        checkby = "",    //接单人
+                        createby = "",
+                        isread = 1,
+                    });
+                }
+            }
+
+
+
+
+            var obj = new
+            {
+                rows = list,
+                total = list.Count
+
+            };
+            return Success("获取成功", obj);
+        }
+
+        [HttpGet("getyd")]
+        public async Task<IActionResult> GetYdList(string id)
+        {
+
+
+            string nowusercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            //  string nowusercode="1003";
+            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode == 1 && x.readby == nowusercode && x.id == id);
+            if (listmap != null)
+            {
+                var modelmap = listmap.FirstOrDefault();
+                if (modelmap != null)
+                {
+                    modelmap.isread = 1;
+                    modelmap.isnotice = 1;
+
+                    modelmap.readtime = DateTime.Now;
+                    bool b = await _wo_order_user_maprepository.UpdateOne(modelmap);
+                }
+                return Success("已读成功");
+            }
+            else
+            {
+                return Success(nowusercode + listmap.ToJson());
+            }
+
+        }
+
+
         #endregion
     }
 }

MadRunFabric.EquipmentApi/EquipmentApi/Model/MessageListDto.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace EquipmentApi.Model
+{
+    public class MessageListDto
+    {
+        /// <summary>
+        /// id编号
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 工单来源： 维修订单 = 1, 保养订单 = 2, 保养计划订单 = 3，超时工单 = 4
+        /// </summary>
+        public int channelcode { get; set; }
+        /// <summary>
+        /// 工单类型： 报修 = 1, 保养 = 2, 巡检 = 3
+        /// </summary>
+        public int wotype { get; set; }
+        /// <summary>
+        /// 工单状态:0创建工单，1已转派（转派或者抢单），2已处理，3已评价，6挂起，7挂起，8已取消，9已完成，99超时
+        /// </summary>
+        public int wostate { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string wocode { get; set; } = "";
+        /// <summary>
+        /// 工单id
+        /// </summary>
+        public string woid { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string proname { get; set; }
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string title { get; set; }
+        /// <summary>
+        /// 接单人（转派）
+        /// </summary>
+        public string checkby { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string content { get; set; }
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public string statename { get; set; }
+        /// <summary>
+        /// 创建人id
+        /// </summary>
+        public string createby { get; set; }
+        public DateTime createtime
+        {
+            get
+            {
+                return _createtime.ToLocalTime();
+            }
+            set
+            {
+                _createtime = value.ToLocalTime();
+            }
+        }
+        private DateTime _createtime = DateTime.Now.ToLocalTime();
+        /// <summary>
+        /// 是否已读 (0未读【推送消息】，1已读)
+        /// </summary>
+        public int isread { get; set; } = 0;
+    }
+}

MadRunFabric.MessageApi/MessageApi/Controllers/Application/ApplicationsVersionController.cs

@@ -271,19 +271,22 @@ namespace MessageApi.Controllers
             //其他方法
             //Task<IEnumerable<App_ApplicationsVersion>> list = _app_applicationsVersionRepository.Get(null, null, sort);
             //var model = list.Result.SingleOrDefault();
-            if (model.downurl != null)
+           
+           
+            if (model != null)
             {
-
-                foreach (var item in model.downurl.ToArray())
+                if (model.downurl != null)
                 {
+
+                    foreach (var item in model.downurl.ToArray())
+                    {
                         if (item.fileurl.Contains(oldurl))
                         {
                             item.fileurl = item.fileurl.Replace(oldurl, newurl);
                         }
+                    }
                 }
-             }
-            if (model != null)
-            {
+
                 var result = new
                 {
                     id = model.id,

MadRunFabric.MessageApi/MessageApi/Controllers/MessageController.cs

@@ -14,6 +14,8 @@ using Microsoft.Extensions.Caching.Distributed;
 using MadRunFabric.Model.MessageApi;
 using MessageApi.Model;
 using Microsoft.Extensions.Configuration;
+using System.Security.Cryptography.X509Certificates;
+using NetTaste;
 
 namespace MessageApi.Controllers
 {
@@ -866,8 +868,14 @@ namespace MessageApi.Controllers
             #region 不同地方
             //int messagetype = 1;    //消息通知
             //运维员工YWYG，运维主管YWZG
-            string rolecode =  User.Claims.FirstOrDefault(c => c.Type == "RoleCode").Value;
-            string usercode =  User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;//工单用户查看关系表 - 已查看订单
+             string rolecode =  User.Claims.FirstOrDefault(c => c.Type == "RoleCode").Value;
+             string usercode =  User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;//工单用户查看关系表 - 已查看订单
+
+            //string rolecode = "XTWH";
+            // string usercode = "8000";
+
+          
+            
             string projectlist = "";
             //获取角色code
             var modelUser =  await _sys_user_accountRepository.GetSingle(x => x.usercode == usercode);
@@ -1368,6 +1376,7 @@ namespace MessageApi.Controllers
         /// 消息通知 - 设备维修（报修工单） - old通过时间（不用）
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         [HttpGet("getmessagelist2")]
         public async Task<IActionResult> GetMessagesList2(string stime)
         {
@@ -1484,6 +1493,99 @@ namespace MessageApi.Controllers
             return Success("获取成功", obj);
         }
 
+
+        [HttpGet("getbxmessagelist")]
+        public async Task<IActionResult> GetBxMessageList(int isread) {
+            string nowusercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            var listmap = await _wo_order_user_maprepository.Get(x =>   x.channelcode == 1 && x.readby == nowusercode);
+                   
+            var list= new List<MessageListDto>();
+            if (isread == 0)
+            {
+                var listnoreadmaps = listmap.Where(x => x.isread == 0).OrderByDescending(x => x.readtime).Take(50);
+                foreach (var item in listnoreadmaps)
+                {
+                    list.Add(new MessageListDto
+                    {
+                        id = item.id,
+                        woid = item.woid,
+                        channelcode = (int)EnumOrderState.维修工单,
+                        wotype = (int)EnumWoType.维修,
+                        wocode = item.wocode,
+                        proname = "维修工单:" + item.wocode, // + " " + item.proname,
+                        title = "待处理提醒",
+                        content = item.note,
+                        wostate = item.wostate,
+                        statename = "", //工单状态
+                        checkby = "",    //接单人
+                        createby = "",
+                        isread = 0,
+                    });
+                }
+            }
+            else {
+                var listreadmaps = listmap.Where(x => x.isread == 1).OrderByDescending(x => x.readtime).Take(50);
+               
+
+                foreach (var item in listreadmaps)
+                {
+                    list.Add(new MessageListDto
+                    {
+                        id = item.id,
+                        woid = item.id,
+                        channelcode = (int)EnumOrderState.维修工单,
+                        wotype = (int)EnumWoType.维修,
+                        wocode = item.wocode,
+                        proname = "维修工单:" + item.wocode, // + " " + item.proname,
+                        title = item.wocode,
+                        content = item.note,
+                        wostate = item.wostate,
+                        statename = "", //工单状态
+                        checkby = "",    //接单人
+                        createby = "",
+                        isread = 1,
+                    });
+                }
+            }
+
+           
+
+           
+            var obj = new
+            {
+                rows = list,
+                total=list.Count
+                 
+            };
+            return Success("获取成功", obj);
+        }
+
+        [HttpGet("getyd")]
+        public async Task<IActionResult> GetYdList(string id) {
+       
+            
+            string nowusercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+           //  string nowusercode="1003";
+            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode == 1 && x.readby == nowusercode && x.id==id);
+            if (listmap != null)
+            {
+                var modelmap = listmap.FirstOrDefault();
+                if (modelmap != null)
+                {
+                    modelmap.isread = 1;
+                    modelmap.isnotice = 1;
+
+                    modelmap.readtime = DateTime.Now;
+                    bool b = await _wo_order_user_maprepository.UpdateOne(modelmap);
+                }
+                return Success("已读成功");
+            }
+            else {
+                return Success( nowusercode+listmap.ToJson());
+            }
+           
+        }
+
         /// <summary>
         /// 消息通知类型
         /// </summary>