1

Api.PushMessage/Api.PushMessage/appsettings.json

@@ -9,17 +9,17 @@
     }
   },
   "PushMessageOptions": {
-    "URL": "http://192.168.5.46:28000/", //接口API网址122.114.109.238
-    "HOST": "http://sdk.open.api.igexin.com/apiex.htm", //参数设置 - http的域名
-    //"HOST": "https://api.getui.com/apiex.htm",        //参数设置 - https的域名
-    //定义常量, appId、appKey、masterSecret pro
+    "URL": "http://192.168.5.46:28000/", //锟接匡拷API锟斤拷址122.114.109.238
+    "HOST": "http://sdk.open.api.igexin.com/apiex.htm", //锟斤拷锟斤拷锟斤拷锟斤拷 - http锟斤拷锟斤拷锟斤拷
+    //"HOST": "https://api.getui.com/apiex.htm",        //锟斤拷锟斤拷锟斤拷锟斤拷 - https锟斤拷锟斤拷锟斤拷
+    //锟斤拷锟藉常锟斤拷, appId锟斤拷appKey锟斤拷masterSecret pro
     "APPID": "4wtvP9MoWq9uUthz6Fswq3",
     "APPKEY": "kMrAbcibZZ9OwXGiPyuiN2",
     "MASTERSECRET": "faZAavbB8b5MjrOOFBzJS5",
-    "DeviceToken": "EFFE641A8C24C5D55F9BF88DD5271DD9A784DD4E8B36013C11CA51757FF54AFB", //填写IOS系统的DeviceToken
-    "AppLogo": "http://192.168.5.46/img/app/hint_icon.png", //app推送消息图标（通知栏显示本地图片）
-    "AppLogoUrl": "http://192.168.5.46/img/app/hint_icon.png", //app推送消息图标（通知栏显示网络图标）
-    "SleepTime": 20000 //线程运行间隔
+    "DeviceToken": "EFFE641A8C24C5D55F9BF88DD5271DD9A784DD4E8B36013C11CA51757FF54AFB", //锟斤拷写IOS系统锟斤拷DeviceToken
+    "AppLogo": "http://192.168.5.46/img/app/hint_icon.png", //app锟斤拷锟斤拷锟斤拷息图锟疥（通知锟斤拷锟斤拷示锟斤拷锟斤拷图片锟斤拷
+    "AppLogoUrl": "http://192.168.5.46/img/app/hint_icon.png", //app锟斤拷锟斤拷锟斤拷息图锟疥（通知锟斤拷锟斤拷示锟斤拷锟斤拷图锟疥）
+    "SleepTime": 20000 //�߳����м��
   }
 
 }

MadRunFabirc.DistributionApi/DistributionApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabirc.DistributionApi/DistributionApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabirc.DistributionApi/DistributionApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabirc.DistributionApi/DistributionApi/appsettings.Production.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabirc.Model/EquipmentApi.Model/Wo_Repair_Base.cs

@@ -266,5 +266,9 @@ namespace MadRunFabric.Model
         /// 超时了多久
         /// </summary>
         public string wxtimecenter { get; set; }
+        /// <summary>
+        /// 是否返修
+        /// </summary>
+        public int? isrepair { get; set; }
     }
 }

MadRunFabirc.Model/EquipmentApi.Model/infotxs.cs

@@ -35,6 +35,5 @@ namespace MadRunFabric.Model.EquipmentApi.Model
         /// 是否删除(0正常1删除)
         /// </summary>
         public int isdelete { get; set; }
-
     }
 }

MadRunFabirc.Model/EquipmentApi.Model/wxwpstime.cs

@@ -23,6 +23,11 @@ namespace MadRunFabric.Model.EquipmentApi.Model
         /// 时长
         /// </summary>
         public int timecount { get; set; }
+
+        /// <summary>
+        /// 父级id
+        /// </summary>
+        public string parentid { get; set; }
         /// <summary>
         /// 班组编号
         /// </summary>

MadRunFabric.CallCenterApi/CallCenterApi/appsettings.Development.json

@@ -20,8 +20,8 @@
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //"mongodb://122.114.109.213:37017", //
     //"ConnectionString": "mongodb://root:123456@117.160.143.199:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.CallCenterApi/CallCenterApi/appsettings.Development_Base.json

@@ -19,8 +19,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.CallCenterApi/CallCenterApi/appsettings.Development_Test.json

@@ -19,8 +19,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.CallCenterApi/CallCenterApi/appsettings.Production.json

@@ -17,8 +17,8 @@
     //"ConnectionString": "mongodb://:27017",
     //"ConnectionString": "mongodb://root:hnjy800100@192.168.5.60:27017",
     //"Database": "hnjyCallCenter_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.60",

MadRunFabric.ConfigurationApi/ConfigurationApi/Controllers/Role/RoleFunctionController.cs

@@ -106,9 +106,6 @@ namespace ConfigurationApi.Controllers
                         continue;
                     }
                 }
-
-
-
                 Models.Dto.RoleFDto tree = new Models.Dto.RoleFDto();
                 tree.id = EnumRoleControlType.Moudle.ToString() + "_" + item.id.ToString();
                 tree.pid = EnumRoleControlType.Moudle.ToString() + "_" + item.parent_id.ToString();

MadRunFabric.ConfigurationApi/ConfigurationApi/appsettings.Development.json

@@ -15,8 +15,8 @@
     "SecretKey": "HYBambooJIe256sdkDfjiTSkjienTGjnVcu85114udfhbudgdkfUh"
   },
   "MongoConnection": {
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.ConfigurationApi/ConfigurationApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.ConfigurationApi/ConfigurationApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.ConfigurationApi/ConfigurationApi/appsettings.Production.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.EquipmentApi/EquipmentApi.Repositories/Wo_Repair_BaseRepository.cs

@@ -1727,21 +1727,22 @@ namespace EquipmentApi.Repositories
             {
                 //if (userinfo.isallproject == 1)
                 //{
-                    if (!string.IsNullOrEmpty(usercode)) query = query.Where(it => (it.touser.Contains(usercode) || it.dealuser.Contains(usercode)));
+                //    if (!string.IsNullOrEmpty(usercode)) query = query.Where(it => (it.touser.Contains(usercode) || it.dealuser.Contains(usercode)));
                 //}
                 //else if (userinfo.isallproject == 0)
                 //{
                 //    query = query.Where(it => userinfo.projectlist.Contains(it.projectid));
 
 
-                //    if (userinfo.role_code == "YWYG")
-                //    {
-                //        query = query.Where(it => (it.touser.Count() == 0 || it.touser.Contains(nowusercode) || it.dealuser.Contains(nowusercode)));
-                //    }
-                //    else
-                //    {
-                //        if (!string.IsNullOrEmpty(usercode)) query = query.Where(it => (it.touser.Contains(usercode) || it.dealuser.Contains(usercode)));
-                //    }
+                   if (userinfo.role_code == "YWYG")
+                    {
+                        query = query.Where(it => (it.touser.Count() == 0 || it.touser.Contains(nowusercode) || it.dealuser.Contains(nowusercode))
+                        );
+                    }
+                    else
+                   {
+                       if (!string.IsNullOrEmpty(usercode)) query = query.Where(it => (it.touser.Contains(usercode) || it.dealuser.Contains(usercode)));
+                   }
                 //}
             }
             
@@ -1895,7 +1896,9 @@ namespace EquipmentApi.Repositories
             //}
             if (userinfo.role_code == "YWYG")
             {
-                query = query.Where(it => it.touser.Contains(userinfo.usercode));
+                query = query.Where(it => it.touser.Contains(userinfo.usercode)
+                || (it .Jwocode== userinfo.role_name && it .wostate==0)  );
+
             }
 
             #region 时间搜索

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

@@ -27,6 +27,8 @@ using com.igetui.api.openservice;
 using com.igetui.api.openservice.igetui;
 using com.igetui.api.openservice.igetui.template;
 using System.Data;
+using MongoDB.Driver.Core.Bindings;
+using OfficeOpenXml.FormulaParsing.Utilities;
 
 namespace EquipmentApi.Controllers.workordermanage
 {
@@ -314,7 +316,8 @@ namespace EquipmentApi.Controllers.workordermanage
 
             foreach (var item in lists)
             {
-                var ifhave = await _wo_repair_baseRepository.Get(p => p.repairreplace == item.repairreplace&&p.repairoom==item.repairoom&&p.faultdescripe==item.faultdescripe);
+                var ifhave = await _wo_repair_baseRepository.Get(p => p.repairreplace == item.repairreplace
+                &&p.repairoom==item.repairoom&&p.faultdescripe==item.faultdescripe);
                 if (ifhave.Count() > 1)
                 {
                     list.Add(item);
@@ -6820,6 +6823,64 @@ namespace EquipmentApi.Controllers.workordermanage
                     //SendWechatMessage(clmodel.wocode, "故障报修成功！", "编号：" + clmodel.wocode + "\n故障现象：" + clmodel.faultdescripe, res, optuser);
                 }
                 AddItems(clmodel.wocode, clmodel.wostate, input.channel, users + " 创建工单", clmodel.faultpic, optuser, optusername, "");
+
+                if (input.ispd>0)
+                {
+                    if (string.IsNullOrEmpty(input.assignman))
+                    {
+                        return Error("请选择维修班组");
+                    }
+                    clmodel.wostate = 0;
+                    clmodel.totype = 1;
+                    clmodel.touser = new List<string>();
+                    clmodel.tousername = new List<string>();
+                    clmodel.tobztimes = DateTime.Now;
+                    clmodel.totime = DateTime.Now;
+                    clmodel.dealuser = new List<string>();
+                    clmodel.dealusername = new List<string>();
+                    ///判断是否派过班组
+                    if (clmodel.Jwocode != null && clmodel.Jwocode !=input. assignman && (clmodel.Pwcode == null || clmodel.Pwcode == ""))
+                    {
+                        clmodel.Pwcode = clmodel.Jwocode;
+                    }
+                    else
+                    {
+                        clmodel.Pwcode = "";
+                    }
+                    clmodel.Jwocode = input.assignman;//接单单班组科室
+                    await _wo_repair_baseRepository.UpdateOne(clmodel);
+                    //定义一个表 添加一条数据进行提醒
+                    infotxs infotx = await _infotxsRepository.GetSingle(p => p.wocode == clmodel.wocode);
+                    if (infotx != null)
+                    {
+                        infotx.istxinfo = 0;
+                        await _infotxsRepository.UpdateOne(infotx);
+                    }
+                    else
+                    {
+                        infotxs intxinfo = new infotxs();
+                        intxinfo.zpusern = optusername;
+                        intxinfo.jsuser =input. assignman;
+                        intxinfo.wocode = clmodel.wocode;
+                        intxinfo.istxinfo = 0;
+                        intxinfo.isdelete = 0;
+                        await _infotxsRepository.Add(intxinfo);
+                    }
+                    string msg = string.IsNullOrEmpty(input.assignremark) ? "" : " ，备注：" + input.assignremark;
+
+                    AddItems(clmodel.wocode, clmodel.wostate, clmodel.channel, optuser + "-" + optusername + " 指派工单给 " + input.assignman + "-" + msg, new List<FileBaseModel>(), optuser, optusername, "");
+                    //根据接单班组名称获取班组账号的code
+                    var usercoudemode = await _sys_user_accountRepository.GetSingle(p => p.username == input.assignman);
+                    if (usercoudemode != null)
+                    {
+                        var clintidlist1 = await _IusercoldandclintidsRepository.GetSingle(p => p.usercode == usercoudemode.usercode);
+                        if (clintidlist1 != null)
+                        {
+                            PushMessageToList("通知", "您有新的工单需要处理", clintidlist1.clintid);
+                        }
+                    }
+
+                }
                 return Success("工单保存成功");
             }
             else
@@ -6953,6 +7014,52 @@ namespace EquipmentApi.Controllers.workordermanage
             return Success("工单不存在或工单不为新工单");
         }
 
+
+        /// <summary>
+        /// 返修
+        /// </summary>
+        [HttpPost("repair")]
+        public async Task<IActionResult> RepairDealAsync(string wocode, string repairnotes, int channel = 1)
+        {
+           
+            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>();
+
+            var cls = await _wo_repair_baseRepository.Get(p => p.wocode == wocode && p.isdelete == 0);
+            var clmodel = cls.FirstOrDefault();
+            if (clmodel != null && clmodel.wostate> (int)EnumWorkOrderState.assign)
+            {
+                if (clmodel.isrepair != null&& clmodel.isrepair >= 3)
+                    return Error("返修不能超过三次");
+
+                if (clmodel.isrepair != null && clmodel.isrepair > 0)
+                    clmodel.isrepair = clmodel.isrepair + 1;
+                else
+                    clmodel.isrepair = 1;
+                clmodel.wostate = (int)EnumWorkOrderState.assign;
+               if (  await _wo_repair_baseRepository.UpdateOne(clmodel))
+                {
+                    string dealuserinfos = optuser + "-" + optusername;
+                    AddItems(clmodel.wocode, clmodel.wostate, clmodel.channel, dealuserinfos + " " +
+                         "返修了工单，返修说明：" + repairnotes, null, optuser, optusername, "");
+                    return Success("返修成功");
+                }
+                return Error("返修失败");
+
+            }
+            else
+            {
+                return Error("工单未处理不能返修");
+            }
+
+          
+        }
+
+
+
         /// <summary>
         /// 处理工单
         /// </summary>
@@ -7422,7 +7529,6 @@ namespace EquipmentApi.Controllers.workordermanage
         [HttpPost("backwocode")]
         public async Task<IActionResult> Backwocode(string wocode)
         {
-
             var clmodel = await _wo_repair_baseRepository.GetSingle(p => p.wocode == wocode);
             clmodel.wostate = 0;
             clmodel.touser = new List<string>();
@@ -7431,8 +7537,11 @@ namespace EquipmentApi.Controllers.workordermanage
             clmodel.dealusername = new List<string>();
             await _wo_repair_baseRepository.UpdateOne(clmodel);
             infotxs infotx = await _infotxsRepository.GetSingle(p => p.wocode == wocode);
-            infotx.istxinfo = 0;
-            await _infotxsRepository.UpdateOne(infotx);
+            if (infotx!=null)
+            {
+                infotx.istxinfo = 0;
+                await _infotxsRepository.UpdateOne(infotx);
+            }
             return Success("退单成功");
         }
 
@@ -8549,6 +8658,7 @@ namespace EquipmentApi.Controllers.workordermanage
             wxwpstime tp = new wxwpstime();
             tp.wxcenter = tps.wxcenter;//维修项目
             tp.timecount = tps.timecount;//时长
+            tp.parentid = tps.parentid;//父级id
             tp.bzid = tps.bzid;//班组编号
             tp.isdelete = 0;// 是否删除
             var a = _wxwpstimeRepository.AddRetID(tp);
@@ -8585,6 +8695,7 @@ namespace EquipmentApi.Controllers.workordermanage
             tp.id = tps.id;
             tp.wxcenter = tps.wxcenter;//维修项目
             tp.timecount = tps.timecount;//时长
+            tp.parentid = tps.parentid;//父级id
             tp.bzid = tps.bzid;//班组编号
             tp.isdelete = 0;// 是否删除
             var resua = _wxwpstimeRepository.Update(tp);
@@ -8652,6 +8763,7 @@ namespace EquipmentApi.Controllers.workordermanage
                 model.wxcenter = item.wxcenter;//维修项目
                 model.timecount = item.timecount;//时长
                 model.bzid = item.bzid;//班组编号
+
                 if (roleinfo != null)
                 {
                     model.bzname = roleinfo.role_name;//班组名称
@@ -8666,6 +8778,58 @@ namespace EquipmentApi.Controllers.workordermanage
             return Success("成功", obj);
         }
 
+        /// <summary>
+        /// 获取维修项目信息树形图
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        [HttpGet("getwxwpstimetree")]
+        public async Task<IActionResult> GetRoleFunctionAsync(string role_id)
+        {
+            var moduleInfoList = (await _wxwpstimeRepository.Get(x => x.isdelete == 0)).ToList();
+               List<Sys_Role_Info> roleinfo = (await _ISys_Role_InfoRepository.Get(p=>p .state_flag==1)).ToList();
+            var treeList = new List<Model.Dto.wxwpstimeFDto>();
+            var parentlist = moduleInfoList.Where(X => string.IsNullOrEmpty(X.parentid)).ToList();
+            var tree = BindTreeNew(parentlist, moduleInfoList, roleinfo);
+            return Success("权限树形加载成功", tree);
+        }
+
+        private List<Model.Dto.wxwpstimeFDto> BindTreeNew(List<wxwpstime> parentlist, List<wxwpstime> moduleInfoList, List<Sys_Role_Info> roleinfo)
+        {
+            if (moduleInfoList != null && moduleInfoList.Count > 0)
+            {
+
+                var treeList = new List<Model.Dto.wxwpstimeFDto>();
+                for (int i = 0; i < parentlist.Count; i++)
+                {
+                    Model.Dto.wxwpstimeFDto model = new Model.Dto.wxwpstimeFDto();
+                    string currentID = parentlist[i ].id;//当前功能ID
+                    model.id = currentID;
+                    model.wxcenter = parentlist[i].wxcenter;
+                    model.pid = parentlist[i].parentid;
+                    model.bzid = parentlist[i].bzid;
+                    if (roleinfo.Where(x => x.id == parentlist[i].bzid).Count() >0)
+                    {
+                        model.name = roleinfo.Where(x => x.id == parentlist[i].bzid).FirstOrDefault().role_name;
+                    }
+                    var subclass  = moduleInfoList.Where(x=>x.parentid== currentID).ToList();
+                   
+                    if (subclass != null && subclass.Count > 0)
+                    {
+                        model.child = BindTreeNew(subclass, moduleInfoList, roleinfo);
+                    }
+                    treeList.Add(model);
+                }
+                return treeList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
         ///根据当前登陆人所属班组
         [HttpGet("getwxwptimesbybz")]
         public async Task<IActionResult> Getwxwptimesbybz(string id)

MadRunFabric.EquipmentApi/EquipmentApi/Model/Dto/wxwpstimeFDto.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+
+namespace EquipmentApi.Model.Dto
+{
+    public class wxwpstimeFDto
+    {
+        public string id { get; set; }
+        /// <summary>
+        /// 父级节点ID
+        /// </summary>
+        public string pid { get; set; }
+        public string name { get; set; }
+        public string bzid { get; set; } 
+        public string wxcenter { get; set; }
+
+        public List<wxwpstimeFDto>  child { get; set; }
+    }
+}

MadRunFabric.EquipmentApi/EquipmentApi/Model/Input/WoRepairBaseInput.cs

@@ -139,5 +139,17 @@ namespace EquipmentApi.Model.Input
         /// 第一次选择的时效编号
         /// </summary>
         public string wxtimeidone { get; set; }
+        /// <summary>
+        /// 是否派单
+        /// </summary>
+        public int ispd { set; get; } = 0;
+        /// <summary>
+        /// 指派班组
+        /// </summary>
+        public string assignman { set; get;  }
+        /// <summary>
+        /// 派单意见
+        /// </summary>
+        public string assignremark { set; get; }
     }
 }

MadRunFabric.EquipmentApi/EquipmentApi/Model/Input/wxwpstimeinput.cs

@@ -19,6 +19,11 @@ namespace EquipmentApi.Model.Input
         /// 时长
         /// </summary>
         public int timecount { get; set; }
+
+        /// <summary>
+        /// 父级id
+        /// </summary>
+        public string parentid { get; set; }
         /// <summary>
         /// 班组编号
         /// </summary>

MadRunFabric.EquipmentApi/EquipmentApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "ConnectionStrings": {
     //"Sqlserverconnection": "server=172.16.2.162;uid=zl;pwd=zl@2021;database=HERP331;"

MadRunFabric.EquipmentApi/EquipmentApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "ConnectionStrings": {
     //"Sqlserverconnection": "server=172.16.2.162;uid=zl;pwd=zl@2021;database=HERP331;"

MadRunFabric.EquipmentApi/EquipmentApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "ConnectionStrings": {
     //"Sqlserverconnection": "server=172.16.2.162;uid=zl;pwd=zl@2021;database=HERP331;"

MadRunFabric.EquipmentApi/EquipmentApi/appsettings.Production.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "ConnectionStrings": {
     //"Sqlserverconnection": "server=172.16.2.162;uid=zl;pwd=zl@2021;database=HERP331;"

MadRunFabric.FileServerApi/FileServerApi/Startup.cs

@@ -137,7 +137,7 @@ namespace FileServerApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
+                options.Filters.Add<ActionFilter>();
                 options.Filters.Add(new ExceptionFilter());
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());

MadRunFabric.FileServerApi/FileServerApi/appsettings.Development.json

@@ -23,8 +23,8 @@
     "SecretKey": "HYBambooJIe256sdkDfjiTSkjienTGjnVcu85114udfhbudgdkfUh"
   },
   "MongoConnection": {
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.FileServerApi/FileServerApi/appsettings.Development_Base.json

@@ -25,8 +25,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.FileServerApi/FileServerApi/appsettings.Development_Test.json

@@ -23,8 +23,8 @@
     "SecretKey": "HYBambooJIe256sdkDfjiTSkjienTGjnVcu85114udfhbudgdkfUh"
   },
   "MongoConnection": {
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.FileServerApi/FileServerApi/appsettings.Production.json

@@ -23,8 +23,8 @@
     "SecretKey": "HYBambooJIe256sdkDfjiTSkjienTGjnVcu85114udfhbudgdkfUh"
   },
   "MongoConnection": {
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.HangfireApi/HangfireApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.HangfireApi/HangfireApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.HangfireApi/HangfireApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.HangfireApi/HangfireApi/appsettings.Production.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.MessageApi/MessageApi/appsettings.Development.json

@@ -22,8 +22,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.MessageApi/MessageApi/appsettings.Development_Base.json

@@ -22,8 +22,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.MessageApi/MessageApi/appsettings.Development_Test.json

@@ -22,8 +22,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.MessageApi/MessageApi/appsettings.Production.json

@@ -22,8 +22,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.OnLineChatApi/OnLineChatApi/Startup.cs

@@ -138,7 +138,7 @@ namespace OnLineChatApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
+                options.Filters.Add<ActionFilter>();
                 options.Filters.Add(new ExceptionFilter());
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());

MadRunFabric.OnLineChatApi/OnLineChatApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.OnLineChatApi/OnLineChatApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.OnLineChatApi/OnLineChatApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.OnLineChatApi/OnLineChatApi/appsettings.Production.json

@@ -15,8 +15,8 @@
     "SecretKey": "HYBambooJIe256sdkDfjiTSkjienTGjnVcu85114udfhbudgdkfUh"
   },
   "MongoConnection": {
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.PLCAutomationApi/PLCAutomationApi/Startup.cs

@@ -147,7 +147,7 @@ namespace PLCAutomationApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
+                options.Filters.Add<ActionFilter>();
                 options.Filters.Add(new ExceptionFilter());
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());

MadRunFabric.PLCAutomationApi/PLCAutomationApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.PLCAutomationApi/PLCAutomationApi/appsettings.Development_Base.json

@@ -16,8 +16,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.PLCAutomationApi/PLCAutomationApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.PLCAutomationApi/PLCAutomationApi/appsettings.Production.json

@@ -14,8 +14,8 @@
     "SecretKey": "HYBambooJIe256sdkDfjiTSkjienTGjnVcu85114udfhbudgdkfUh"
   },
   "MongoConnection": {
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development_Base.json

@@ -20,8 +20,8 @@
     //"Database": "madrunfabricdb_base"
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development_Test.json

@@ -20,8 +20,8 @@
     //"Database": "madrunfabricdb"
     //"ConnectionString": "mongodb://root:123456@192.168.56.1:27017", //本机
     //"Database": "madrunfabricdb_base" //madrunfabricdb_base madrunfabricdb
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Production.json

@@ -18,8 +18,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.TestUserTypeApi/TestUserTypeApi/appsettings.Development.json

@@ -17,19 +17,19 @@
   "mzupload": {
     "url": "http://192.168.0.1:28000/fileserverapi/api/upload",
     "params": "uploadtype=excel",
-    "mbname": "门诊患者.xlsx",
-    "mbkeys": "患者编码,门诊就诊号,姓名,性别,出生日期,证件类型,身份证,联系电话,疾病名称,就诊科室,就诊时间",
+    "mbname": "锟斤拷锟斤患锟斤拷.xlsx",
+    "mbkeys": "���߱���,��������,����,�Ա�,��������,֤������,���֤,��ϵ�绰,��������,�������,����ʱ��",
     "dbkeys": "hzcode,mzjzcode,mzhzname,mzhzxb,mzhzbirthday,mzhzzjtype,mzhzsfzcode,mzhzsfzcode,mzhzphone,mzhzjbname,mzhzjzdeptname,mzhzjztime"
   },
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base" //madrunfabricdb_base madrunfabricdb
-    //"ConnectionString": "mongodb://root:123456@192.168.56.1:27017",//本机
+    //"ConnectionString": "mongodb://root:123456@192.168.56.1:27017",//锟斤拷锟斤拷
     //"Database": "madrunfabricdb_base" //madrunfabricdb_base madrunfabricdb
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //锟斤拷锟斤拷
+    "Database": "yh"
   },
-  "allprojectrole": "YWFJL|YWJL|YWZJ|CJGL|XTWH", //查看所有项目
+  "allprojectrole": "YWFJL|YWJL|YWZJ|CJGL|XTWH", //锟介看锟斤拷锟斤拷锟斤拷目
   "Redis": {
     "HostName": "192.168.5.44",
     "Port": "6379",
@@ -49,12 +49,12 @@
     },
     "instance": {
       "preferIpAddress": true,
-      //服务过期时间配置,
-      //超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除 #注意，EurekaServer一定要设置eureka.server.eviction-interval-timer-in-ms否则这个配置无效，这个配置一般为服务刷新时间配置的三倍
-      //默认90s 在删除实例之前，EurekaServer等待的时间，默认= 90秒
+      //�������ʱ������,
+      //�������ʱ��û�н��յ�����EurekaServer�ͻὫ���ʵ���޳� #ע�⣬EurekaServerһ��Ҫ����eureka.server.eviction-interval-timer-in-ms�������������Ч���������һ��Ϊ����ˢ��ʱ�����õ�����
+      //默锟斤拷90s 锟斤拷删锟斤拷实锟斤拷之前锟斤拷EurekaServer锟饺达拷锟斤拷时锟戒，默锟斤拷= 90锟斤拷
       "leaseExpirationDurationInSeconds": 15,
-      //服务刷新时间配置，每隔这个时间会主动心跳一次
-      //默认30s 客户端需要发送心跳的频率，默认值= 30s
+      //锟斤拷锟斤拷刷锟斤拷时锟斤拷锟斤拷锟矫ｏ拷每锟斤拷锟斤拷锟绞憋拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷一锟斤拷
+      //默锟斤拷30s 锟酵伙拷锟斤拷锟斤拷要锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷频锟绞ｏ拷默锟斤拷值= 30s
       "leaseRenewalIntervalInSeconds": 5,
       "statusPageUrlPath": "/api/info",
       "port": 28340

MadRunFabric.TestUserTypeApi/TestUserTypeApi/appsettings.Development_Base.json

@@ -25,8 +25,8 @@
 
     //"ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
     //"Database": "madrunfabricdb_base",
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "sendcent": {
     "centers": "您好 ！感谢您对我们医院的信任与支持，请对本次住院的服务质量给予评价1 满意；2表扬；3 不满意，回复数字即可。谢谢！顺祝生活愉快【郑州市第一人民医院】",

MadRunFabric.TestUserTypeApi/TestUserTypeApi/appsettings.Development_Test.json

@@ -34,8 +34,8 @@
     //"Database": "madrunfabricdb_base" //madrunfabricdb_base madrunfabricdb
     //"ConnectionString": "mongodb://root:123456@192.168.56.1:27017",//本机
     //"Database": "madrunfabricdb_base" //madrunfabricdb_base madrunfabricdb
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "ConnectionStrings": {
 

MadRunFabric.TestUserTypeApi/TestUserTypeApi/appsettings.Production.json

@@ -16,8 +16,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb" //madrunfabricdb_base
-    "ConnectionString": "mongodb://root:123456@192.168.1.26:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.ThirdPartyApi/Startup.cs

@@ -133,7 +133,7 @@ namespace ThirdPartyApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
+                options.Filters.Add<ActionFilter>();
                 options.Filters.Add(new ExceptionFilter());
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());

MadRunFabric.ThirdPartyApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.ThirdPartyApi/appsettings.Production.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.WechatApi/WechatApi/Startup.cs

@@ -144,7 +144,7 @@ namespace SignTokenApi
 
             services.AddMvc(options =>
             {
-                options.Filters.Add(new ActionFilter());
+                options.Filters.Add<ActionFilter>();
                 options.Filters.Add(new ExceptionFilter());
             }).AddJsonOptions(op => op.SerializerSettings.ContractResolver =
                                         new Newtonsoft.Json.Serialization.DefaultContractResolver());

MadRunFabric.WechatApi/WechatApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.WechatApi/WechatApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.WechatApi/WechatApi/appsettings.Development_Test.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.44",

MadRunFabric.WechatApi/WechatApi/appsettings.Production.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:hykj800100@10.125.7.246:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "10.125.7.246",

MadRunFabric.WorkOrderApi/WorkOrderApi/appsettings.Development.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.42",

MadRunFabric.WorkOrderApi/WorkOrderApi/appsettings.Development_Base.json

@@ -17,8 +17,8 @@
   "MongoConnection": {
     //"ConnectionString": "mongodb://root:123456@192.168.5.44:27017",
     //"Database": "madrunfabricdb_base"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     "HostName": "192.168.5.42",

MadRunFabric.WorkOrderApi/WorkOrderApi/appsettings.Production.json

@@ -18,8 +18,8 @@
     //"ConnectionString": "mongodb://10.125.3.215:37017",
     //"ConnectionString": "mongodb://122.114.109.213:37017",
     //"Database": "madrunfabricdb"
-    "ConnectionString": "mongodb://root:123456@192.168.1.94:27017", //本机
-    "Database": "madrunfabricdb_base"
+    "ConnectionString": "mongodb://root:123456@192.168.5.44:27017", //本机
+    "Database": "yh"
   },
   "Redis": {
     //"HostName": "10.125.3.215",