提交日志更新

web/BaseCallCenter.BLL/T_Wo_WorkOrderBase.cs

@@ -551,6 +551,11 @@ namespace YTSoft.BaseCallCenter.BLL
         {
             return dal.UpdateWorkOrderInfoModel(model);
         }
+
+        public string GetOrderNumber(int ordertype)
+        {
+            return dal.GetOrderNumber(ordertype);
+        }
         /// <summary>
         /// 修改转办信息
         /// </summary>

web/BaseCallCenter.Common/Web/CheckPwd.cs

@@ -0,0 +1,54 @@
+using System.Text.RegularExpressions;
+namespace YTSoft.Common
+{
+    public class checkpwd
+    {
+        /// <summary>
+        /// 计算密码强度
+        /// </summary>
+        /// <param name="password">密码字符串</param>
+        /// <returns></returns>
+        /// 
+
+        public class Chkrslt
+        {
+            public bool RSL { set; get; }
+            public string MSG { set; get; }
+        }
+
+        public static Chkrslt PasswordStrength(string password)
+        {
+
+
+            if (password.Length < 8 || password.Length > 16)
+            {
+                return new Chkrslt() { RSL = false, MSG = "密码长度不符合，密码长度：8-16" };
+            }
+
+            Regex rgx = new Regex(@"^[0-9a-zA-Z\x21-\x7e]{8,16}$");
+            if (!rgx.IsMatch(password))
+            {
+                return new Chkrslt() { RSL = false, MSG = "密码只能包含数字，字母和字符" };
+            }
+
+            //字符统计
+            int iNum = 0, iLtt = 0, iSym = 0;
+            foreach (char c in password)
+            {
+                if (c >= '0' && c <= '9') iNum++;
+                else if (c >= 'a' && c <= 'z') iLtt++;
+                else if (c >= 'A' && c <= 'Z') iLtt++;
+                else iSym++;
+            }
+            if (iLtt == 0 && iSym == 0) return new Chkrslt() { RSL = false, MSG = "纯数字密码，请加入字符和字母" }; //纯数字密码
+            if (iNum == 0 && iLtt == 0) return new Chkrslt() { RSL = false, MSG = "纯符号密码，请加入数字和字母" };  //纯符号密码
+            if (iNum == 0 && iSym == 0) return new Chkrslt() { RSL = false, MSG = "纯字母密码，请加入字符和数字" }; //纯字母密码
+
+            if (iLtt == 0) return new Chkrslt() { RSL = true, MSG = "数字和符号构成的密码，请加入字母" }; ; //数字和符号构成的密码
+            if (iSym == 0) return new Chkrslt() { RSL = true, MSG = "数字和字母构成的密码，请加入字符" }; ; //数字和字母构成的密码
+            if (iNum == 0) return new Chkrslt() { RSL = true, MSG = "字母和符号构成的密码，请加入数字" }; //字母和符号构成的密码
+            return new Chkrslt() { RSL = true, MSG = "密码符合" };
+        }
+
+    }
+}

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/WebHelper.cs

@@ -5,7 +5,7 @@ using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
-namespace CallCenter.Utility
+namespace YTSoft.Common
 {
     public class WebHelper
     {

web/BaseCallCenter.Common/YTSoft.Common.csproj

@@ -101,8 +101,10 @@
     <Compile Include="Thumbnail.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="WaterMark.cs" />
+    <Compile Include="Web\CheckPwd.cs" />
     <Compile Include="Web\Tree.cs" />
     <Compile Include="Web\TreeModel.cs" />
+    <Compile Include="Web\WebHelper.cs" />
     <Compile Include="XmlHelper.cs" />
   </ItemGroup>
   <ItemGroup>

web/BaseCallCenter.DAL/T_Wo_WorkOrderBase.cs

@@ -1554,7 +1554,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     new SqlParameter("@F_RETURNVISITCONTENT", model.F_RETURNVISITCONTENT),
                     new SqlParameter("@F_RETURNVISITFLAG", model.F_RETURNVISITFLAG),
                     new SqlParameter("@F_RETURNVISITTIME ", model.F_RETURNVISITTIME),
-                    new SqlParameter("@F_CODE ", GetOrderNumber(int.Parse(model.F_REPAIRLEVEL.ToString()))),
+                    new SqlParameter("@F_CODE ", model.F_CODE),
                     new SqlParameter("@F_FILEFLAG", model.F_FILEFLAG),
                     new SqlParameter("@F_HOUSING ", model.F_HOUSING),
                    // new SqlParameter("@F_LINKMAN", SqlDbType.NVarChar,200),

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/APIController.cs

@@ -874,11 +874,11 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 StringBuilder returnStr = new StringBuilder();
                 if (busType == 4)
                 {
-                    wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/wbcount";
+                    wxAddUrl = "http://rexian.zzmetro.com/api/external/wbcount";
                 }
                 else
                 {
-                    wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/wxcount";
+                    wxAddUrl = "http://rexian.zzmetro.com/api/external/wxcount";
                 }
                 string paramsStr = "begin=" + startDate + "&end=" + endDate;
                 string addWxResult = HttpHelper.HttpGet(wxAddUrl, paramsStr);

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/BaseController.cs

@@ -356,6 +356,22 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             return busLog.Add(modellog);
         }
 
+        public bool AddAction(string TableName, string id, string ActionName, string oldobj="")
+        {
+            Model.T_Com_LogAction modellog = new T_Com_LogAction();
+            modellog.ActionName = ActionName;
+            modellog.AddUser = HttpUtility.UrlDecode(F_UserName);
+            modellog.AddUserId = F_UserID;
+            modellog.Atime = DateTime.Now;
+            modellog.ActionUrl = string.Format("/{0}/{1}", RouteData.Values["controller"], RouteData.Values["action"]);
+            modellog.ContentNew = "操作记录";
+            modellog.ContentOld = oldobj;
+            modellog.TableId = id.ToMyString();
+            modellog.TableName = TableName;
+
+            return busLog.Add(modellog);
+        }
+
         #endregion
 
         #region 公共返回参数

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Com/ClassController.cs

@@ -79,7 +79,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         {
             if (busClass.Delete(id))
             {
-                //AddLog("T_Com_LogAction", model.Id, "删除消息", model, "");
+                AddAction("t_com_class", id.ToMyString(), "删除分类名称");
                 return Success("删除成功");
             }              
             else
@@ -127,10 +127,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
 
 
-
-            if (busClass.Add(model) >0)
+            int id = busClass.Add(model);
+            if (id > 0)
             {
-                //AddLog("T_Com_Tag", model.F_Id.ToString(), "添加标签", "", model);
+                AddAction("t_com_class", id.ToMyString(), "添加分类名称", model.Classname);
                 return Success("成功", modelinput, 1);
             }
             else
@@ -172,10 +172,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     model.typeid = modeltemp.typeid;
             }
 
-
             if (busClass.Update(model))
             {
-                //AddLog("T_Com_Tag", model.F_Id.ToString(), "修改消息", modelold, model);
+                AddAction("t_com_class", model.Classid.ToMyString(), "更新分类名称", model.Classname);
                 return Success("成功", model, 1);
             }
             else

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Com/LogActionController.cs

@@ -34,14 +34,22 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [ActionName("GetListData")]
         public string GetListData(string Table = "", string id = "", int page = 0, int limit = 20)
         {
-            string strWhere = " 1=1 ";
+            string strWhere = "";
+            if (Table == "kf_quick_msgs")
+            {
+                strWhere = " 1=1 ";
+            }
+            else
+            {
+                strWhere += " ContentNew='操作记录' ";
+            }
             if (!string.IsNullOrEmpty(Table))
             {
                 strWhere += string.Format(" and TableName = '{0}'", Table);
             }
             if (!string.IsNullOrEmpty(id))
             {
-                strWhere += string.Format(" and TableId ={0}", id);
+                strWhere += string.Format(" and TableId ='{0}'", id);
             }
 
             DataTable dt = busLogAction.GetListByPage(strWhere, " atime desc ", (page - 1) * limit, limit).Tables[0];
@@ -65,10 +73,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             if (string.IsNullOrEmpty(id))
                 return Error("请输入ID");
 
-            Model.T_Com_LogAction model = busLogAction.GetModel(id);
+            //Model.T_Com_LogAction model = busLogAction.GetModel(id);
             if (busLogAction.Delete(id))
-            {
-                AddLog("T_Com_LogAction", model.Id, "删除消息", JsonConvert.SerializeObject(model), "");
+            {//JsonConvert.SerializeObject(model)
+                AddAction("t_com_logaction", id, "删除操作日志" );
                 return Success("删除成功");
             }              
             else

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/CustomerController.cs

@@ -38,6 +38,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         /// <returns></returns>
         public bool SaveReceivedData(string keyList, int status)
         {
+            AddAction("t_cus_customerbase", keyList, "修改客户状态",status.ToMyString());
             return cusBLL.EditCustonStatus(keyList, status);
         }
         #region 加载客户列表

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/CallRecordController.cs

@@ -11,6 +11,7 @@ using System.Web.Mvc;
 using YTSoft.BaseCallCenter.Model;
 using YTSoft.BaseCallCenter.MVCWeb.Commons;
 using YTSoft.BaseCallCenter.MVCWeb.Models;
+using YTSoft.Common;
 using YTSoft.DBUtility;
 
 namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
@@ -343,7 +344,14 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             {
                 CustomerBaseModel.F_CustomerNature = "语音";
             }
-
+            if (CustomerBaseModel.F_CustomerId > 0)
+            {
+                AddAction("t_cus_customerbase", CustomerBaseModel.F_CustomerId.ToMyString(), "更新客户信息", CustomerBaseModel.F_CustomerName);
+            }
+            else
+            {
+                AddAction("t_cus_customerbase", CustomerBaseModel.F_Telephone, "添加客户信息", CustomerBaseModel.F_CustomerName);
+            }
             return cusBLL.UpdateCusInfoModel(CustomerBaseModel);
         }
 
@@ -567,7 +575,20 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 }
             }
 
-
+            if (workOrderBaseModel.F_WORKORDERSTATEID > 0)
+            {
+                workOrderBaseModel.F_CODE= orderBLL.GetOrderNumber(workOrderBaseModel.F_REPAIRLEVEL.ToInt32());
+                if (workOrderBaseModel.F_WORKORDERTYPEID == 1)
+                {
+                    AddAction("t_wo_workorderbase", workOrderBaseModel.F_WORKORDERID.ToMyString(), "转单处理工单", workOrderBaseModel.F_CODE);
+                }
+                else
+                {
+                    AddAction("t_wo_workorderbase", workOrderBaseModel.F_WORKORDERID.ToMyString(), "即时处理工单", workOrderBaseModel.F_CODE);
+                }
+            }
+            else
+            { workOrderBaseModel.F_CODE = ""; }
 
             return orderBLL.UpdateWorkOrderInfoModel(workOrderBaseModel);
         }
@@ -1310,7 +1331,7 @@ F_DealContent = '留言创建工单' where F_Id = " + leavemodel.F_Id;
         public string  GetCallOutprefix(string phone)      {
 
            
-                string phone1 = CallCenter.Utility.RequestString.ToDBC(RequestString.RemoveNotNumber(WebHelper.NoHtml(phone)));
+                string phone1 = CallCenter.Utility.RequestString.ToDBC(RequestString.RemoveNotNumber(StringHelper.NoHTML(phone)));
                 string tophone = phone1;
                 string zipcode = ""; string bfix = ""; string wfix = ""; string fix = "";
             // string userseatgroupid = CurrentUser.UserData.F_SeartGroupID.ToString();

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/DutyNumberController.cs

@@ -99,9 +99,12 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             model.F_State = 0;
             model.F_Group = "";
             model.F_Groupid = 0;
-            int n = busdutyNumber.Add(model);
-            if(n>0)
-                return Success("成功", model, n);
+            int id = busdutyNumber.Add(model);
+            if (id > 0)
+            {
+                AddAction("t_hw_dutynumber", id.ToMyString(), "新增值班电话", phone);
+                return Success("成功", model, id);
+            }
             else
                 return Error("失败");
         }
@@ -137,7 +140,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             model.F_Group = "";
             model.F_Groupid = 0;
             if (busdutyNumber.Update(model))
+            {
+                AddAction("t_hw_dutynumber", id.ToMyString(), "更新值班电话", phone);
                 return Success("成功");
+            }
             else
                 return Error("失败");
         }
@@ -145,7 +151,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         public string DeleteData( int id = 0)
         {
             if (busdutyNumber.Delete(id))
+            {
+                AddAction("t_hw_dutynumber", id.ToMyString(), "删除值班电话");
                 return Success("删除成功");
+            }
             else
                 return Error("失败");
         }

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/KF/QuickMsgsController.cs

@@ -46,6 +46,16 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             return View();
         }
 
+
+        /// <summary>
+        /// 历史记录
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetHistory()
+        {
+            return View();
+        }
+
         #endregion
 
         [ActionName("GetListData")]

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/OrderController.cs

@@ -184,6 +184,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Post)]
         public bool SubmitOrder(T_Wo_WorkOrderHistory workOrderBaseModel)
         {
+            AddAction("t_wo_workorderhistory", workOrderBaseModel.F_HISTORYID.ToMyString(), "部门提交工单", workOrderBaseModel.F_INSTANCEID.ToMyString());
             return orderBLL.SubmitOrder(workOrderBaseModel);
         }
 
@@ -218,6 +219,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Post)]
         public bool SubmitOrderHF(T_Wo_WorkOrderBase workOrderBaseModel)
         {
+            AddAction("t_wo_workorderbase", workOrderBaseModel.F_WORKORDERID.ToMyString(), "回访提交工单", workOrderBaseModel.F_CODE);
             return orderBLL.SubmitOrderHF(workOrderBaseModel);
         }
 
@@ -441,6 +443,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
                 }
             }
+            AddAction("t_wo_workorderbase", modelorder.F_WORKORDERID.ToMyString(), "提交定责工单", modelorder.F_CODE);
+
             return orderBLL.UpdateDZClass(modelorder);
         }
 

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/OtherPageController.cs

@@ -24,11 +24,11 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         //{
         //    if (pageType == 1)
         //    {
-        //        return Redirect("http://zzmetro-kf.sujie-china.com/customer/" + F_PId);
+        //        return Redirect("http://rexian.zzmetro.com/customer/" + F_PId);
         //    }
         //    else
         //    {
-        //        return Redirect("http://zzmetro-kf.sujie-china.com/customer_weibo/" + F_PId);
+        //        return Redirect("http://rexian.zzmetro.com/customer_weibo/" + F_PId);
         //    }
 
 
@@ -60,17 +60,17 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         //                string wxAddUrl = "";
         //                if (pageType == 1)
         //                {
-        //                    wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/customer/unread/" + F_PId;
+        //                    wxAddUrl = "http://rexian.zzmetro.com/api/customer/unread/" + F_PId;
 
         //                }
         //                else
         //                {
-        //                    wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/customer_weibo/unread/" + F_PId;
+        //                    wxAddUrl = "http://rexian.zzmetro.com/api/customer_weibo/unread/" + F_PId;
         //                }
         //                //if (pageType == 1)
         //                //{
         //                //    wxAddUrl = "http://rexian.zzmetro.com/api/customer/unread/" + F_PId;
-        //                //               //"http://zzmetro-kf.sujie-china.com/customer_weibo/" + F_PId
+        //                //               //"http://rexian.zzmetro.com/customer_weibo/" + F_PId
         //                //    //"http://rexian.zzmetro.com/
         //                //}
         //                //else

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Report/ReportController.cs

@@ -919,11 +919,9 @@ BType, case when (isnull(BusinessType,0)>0 or isnull(F_ServiceType,0)>0) then '
                 StringBuilder returnStr = new StringBuilder();
                 if (busType==4)
                 {
-                    //wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/wbcount";
                     wxAddUrl = "http://rexian.zzmetro.com/api/external/wbcount";
                 }
                 else {
-                    //  wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/wxcount";
                     wxAddUrl = "http://rexian.zzmetro.com/api/external/wxcount";
                 }
                 string paramsStr = "begin=" + startDate + "&end=" + endDate;
@@ -9251,7 +9249,6 @@ BType, case when (isnull(BusinessType,0)>0 or isnull(F_ServiceType,0)>0) then '
             try
             {
                 StringBuilder returnStr = new StringBuilder();
-                //string wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/" + type;
                 string wxAddUrl = "http://rexian.zzmetro.com/api/external/" + type;
                 string paramsStr = "begin=" + startDate + "&end=" + endDate;
                 string addWxResult = HttpHelper.HttpGet(wxAddUrl, paramsStr);
@@ -9289,7 +9286,6 @@ BType, case when (isnull(BusinessType,0)>0 or isnull(F_ServiceType,0)>0) then '
                 totalCount = recordBLL.WorkOrderCount(busType, startDate, endDate);
 
                 StringBuilder returnStr = new StringBuilder();
-                // string wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/wxcount";
                 string wxAddUrl = "http://rexian.zzmetro.com/api/external/wxcount";
                
                 string paramsStr = "begin=" + startDate + "&end=" + endDate;
@@ -9327,7 +9323,6 @@ BType, case when (isnull(BusinessType,0)>0 or isnull(F_ServiceType,0)>0) then '
                 int allWXCount = recordBLL.WorkOrderCount(busType, startDate, endDate);
 
                 StringBuilder returnStr = new StringBuilder();
-                //string wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/external/wxcount";
                 string wxAddUrl = "http://rexian.zzmetro.com/api/external/wxcount";
                 // rexian.zzmetro.com
                 string paramsStr = "begin=" + startDate + "&end=" + endDate;

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/SystemManageController.cs

@@ -11,6 +11,7 @@ using System.Web.Mvc;
 using YTSoft.BaseCallCenter.Model;
 using YTSoft.BaseCallCenter.MVCWeb.Commons;
 using YTSoft.BaseCallCenter.MVCWeb.Models;
+using YTSoft.Common;
 
 namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 {
@@ -77,11 +78,16 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
             if (deptModel.F_DeptId > 0)
             {
+                AddAction("t_sys_department", deptModel.F_DeptId.ToMyString(), "更新部门", deptModel.F_DeptName);
+
                 return deptBLL.Update(deptModel);
             }
             else
             {
-                return deptBLL.Add(deptModel) > 0;
+                int id = deptBLL.Add(deptModel);
+                AddAction("t_sys_department", id.ToMyString(), "添加部门", deptModel.F_DeptName);
+
+                return  id> 0;
             }
         }
         /// <summary>
@@ -92,6 +98,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteDeptData(int deptId)
         {
+            AddAction("t_sys_department", deptId.ToMyString(), "删除部门");
             return deptBLL.Delete(deptId);
 
         }
@@ -216,11 +223,15 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
             if (roleInfoModel.F_RoleId > 0)
             {
+                AddAction("t_sys_roleinfo", roleInfoModel.F_RoleId.ToMyString(), "更新角色", roleInfoModel.F_RoleName);
+
                 return roleBLL.Update(roleInfoModel);
             }
             else
             {
-                return roleBLL.Add(roleInfoModel) > 0;
+                int id = roleBLL.Add(roleInfoModel);
+                AddAction("t_sys_roleinfo", id.ToMyString(), "添加角色", roleInfoModel.F_RoleName);
+                return id > 0;
             }
         }
 
@@ -235,6 +246,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteRoleData(string roleId)
         {
+            AddAction("t_sys_roleinfo", roleId.ToMyString(), "删除角色");
             return roleBLL.DeleteList(roleId);
 
         }
@@ -405,11 +417,14 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
             if (WorkOrderTypeModel.F_WorkOrderTypeId > 0)
             {
+                AddAction("t_wo_workordertype", WorkOrderTypeModel.F_WorkOrderTypeId.ToMyString(), "更新工单分类",WorkOrderTypeModel.F_Name);
                 return dicTittleBLL.Update(WorkOrderTypeModel) > 0;
             }
             else
             {
-                return dicTittleBLL.Add(WorkOrderTypeModel) > 0;
+                int id = dicTittleBLL.Add(WorkOrderTypeModel);
+                AddAction("t_wo_workordertype", id.ToMyString(), "添加工单分类", WorkOrderTypeModel.F_Name);
+                return id > 0;
             }
         }
 
@@ -422,8 +437,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteBussiTypeData(int WorkOrderTypeId)
         {
+            AddAction("t_wo_workordertype", WorkOrderTypeId.ToMyString(), "删除工单分类");
             return dicTittleBLL.Delete(WorkOrderTypeId);
-
         }
         #endregion
 
@@ -541,10 +556,12 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         {
             if (!string.IsNullOrEmpty(dicBaseModel.F_DictionaryFlagType))
             {
+                AddAction("t_sys_dictionarybase", dicBaseModel.F_DictionaryFlagType, "更新字典项");
                 return dicBaseBLL.Update(dicBaseModel);
             }
             else
             {
+                AddAction("t_sys_dictionarybase", dicBaseModel.F_DictionaryFlagType, "添加字典项");
                 return dicBaseBLL.Add(dicBaseModel);
             }
         }
@@ -557,8 +574,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteBaseData(string baseCode)
         {
+            AddAction("t_sys_dictionarybase", baseCode,"删除字典项");
             return dicBaseBLL.Delete(baseCode);
-
         }
 
         /// <summary>
@@ -593,11 +610,15 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         {
             if (dicBaseModel.F_DictionaryValueId > 0)
             {
+                AddAction("t_sys_dictionaryvalue", dicBaseModel.F_DictionaryValueId.ToMyString(), "更新字典值");
                 return dicValueBLL.Update(dicBaseModel);
             }
             else
             {
-                return dicValueBLL.Add(dicBaseModel) > 0;
+                
+                int id = dicValueBLL.Add(dicBaseModel);
+                AddAction("t_sys_dictionaryvalue", id.ToMyString(), "添加字典值");
+                return id > 0;
             }
         }
 
@@ -609,6 +630,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteValueData(int id)
         {
+            AddAction("t_sys_dictionaryvalue", id.ToMyString(), "删除字典值");
             return dicValueBLL.Delete(id);
 
         }
@@ -711,14 +733,17 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         public bool SaveMenuData(T_Sys_ModuleFunctions menuModel)
         {
 
-
             if (menuModel.F_FunctionId > 0)
             {
+                AddAction("t_sys_modulefunctions", menuModel.F_FunctionId.ToMyString(), "更新菜单", menuModel.F_Name);
+
                 return menuBLL.Update(menuModel);
             }
             else
             {
-                return menuBLL.Add(menuModel) > 0;
+              int id = menuBLL.Add(menuModel);
+              AddAction("t_sys_modulefunctions", id.ToMyString(), "添加菜单", menuModel.F_Name);
+              return id > 0;
             }
         }
 
@@ -731,6 +756,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteMenuData(int menuId)
         {
+            AddAction("t_sys_modulefunctions", menuId.ToMyString(), "删除菜单");
             return menuBLL.Delete(menuId);
 
         }
@@ -804,6 +830,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 oldUserModel.F_SeatRight = userModel.F_SeatRight;
                 oldUserModel.F_Password = userModel.F_Password;
                 oldUserModel.F_Remark = userModel.F_Remark;
+                AddAction("t_sys_useraccount", userModel.F_UserId.ToMyString(), "更新用户", userModel.F_UserName);
                 return userBLL.Update(oldUserModel);
             }
             else
@@ -811,13 +838,13 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 userModel.F_HJType = 0;
                 userModel.F_GroupId = 1;
 
-                if (userModel.F_SeatFlag)
+                if (userModel.F_SeatFlag&&false)
                 {
                     #region 调用接口插入用户信息
                     try
                     {
                         StringBuilder returnStr = new StringBuilder();
-                        string wxAddUrl = "http://zzmetro-kf.sujie-china.com/api/customer/insert";
+                        string wxAddUrl = "http://rexian.zzmetro.com/api/customer/insert";
                         UserInfo model = new UserInfo();
                         model.name = userModel.F_UserCode;
 
@@ -834,10 +861,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 }
 
 
-
-
-
-                return userBLL.Add(userModel) > 0;
+                
+                int userid = userBLL.Add(userModel);
+                AddAction("t_sys_useraccount", userid.ToMyString(), "新增用户", userModel.F_UserName);
+                return userid > 0;
             }
         }
         /// <summary>
@@ -848,8 +875,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         [AcceptVerbs(HttpVerbs.Get)]
         public bool DeleteUserData(int userId)
         {
+            AddAction("t_sys_useraccount", userId.ToMyString(), "删除用户");
             return userBLL.Delete(userId);
-
         }
         /// <summary>
         /// 获取用户数据
@@ -919,13 +946,30 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             return View(model);
         }
 
+        /// </summary>
+        [AcceptVerbs(HttpVerbs.Post)]
+        public ActionResult CheckPwd(string pwd)
+        {
+            checkpwd.Chkrslt chkrslt = checkpwd.PasswordStrength(pwd);
+
+            return Json(new
+            {
+                code = chkrslt.RSL ? 0 : 1,
+                msg = chkrslt.MSG
+            });
+        }
+
         /// <summary>
         ///保存修改密码
         /// </summary>
         [AcceptVerbs(HttpVerbs.Post)]
         public string UpdateUserPwd(Model.T_Sys_UserAccount model)
         {
-
+            checkpwd.Chkrslt chkrslt = checkpwd.PasswordStrength(model.password);
+            if(!chkrslt.RSL)
+            {
+                return chkrslt.MSG;
+            }
             string AddRersult = "false";
             if (model.F_UserId > 0)
             {
@@ -936,6 +980,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     newModel.F_Password = model.password;
                     if (userBLL.Update(newModel))
                     {
+                        AddAction("t_sys_useraccount", model.F_UserId.ToMyString(), "修改密码");
                         AddRersult = "True";
                     }
                 }
@@ -1209,8 +1254,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     oldnoticeinfoModel.F_Content = noticeinfoModel.F_Content;
                     oldnoticeinfoModel.F_ReceiveInfo = noticeinfoModel.F_ReceiveInfo;
                     oldnoticeinfoModel.F_DeviceId = noticeinfoModel.F_DeviceId;
-                    oldnoticeinfoModel.F_State = 1;
+                    oldnoticeinfoModel.F_State = 1;                    
                     result = noticeBLL.Update(oldnoticeinfoModel);
+                    AddAction("t_msg_noticeinfo", oldnoticeinfoModel.F_NoticeId.ToMyString(), "修改公告");
                 }
                 else
                 {
@@ -1219,7 +1265,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     noticeinfoModel.F_State = 1;
                     noticeinfoModel.F_CreateOn = DateTime.Now;
                     readdate = noticeinfoModel.F_CreateOn;
-                    noticeid = noticeBLL.Add(noticeinfoModel); 
+                    
+                    noticeid = noticeBLL.Add(noticeinfoModel);
+                    AddAction("t_msg_noticeinfo", noticeid.ToMyString(), "添加公告");
                 } 
                 //指定方式发送公告
                 if (noticeinfoModel.F_DeviceId > 0)
@@ -1287,6 +1335,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 if (dt.Rows.Count > 0)
                 { 
                     res = noticeBLL.Delete(noticeId);
+                    AddAction("t_msg_noticeinfo", noticeId.ToMyString(), "删除公告");
                     //指定部门发公告 
                     dtuser = new YTSoft.BaseCallCenter.BLL.T_Sys_UserAccount().GetList("1=1 and F_DeptId= " + Convert.ToInt32( dt.Rows[0]["F_ReceiveInfo"].ToString()) ).Tables[0];
                     foreach (DataRow dr in dtuser.Rows)

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/WXInterFaceController.cs

@@ -274,7 +274,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     try
                     {
                         StringBuilder returnStr = new StringBuilder();
-                        string wxAddUrl = string.Format("http://zzmetro-kf.sujie-china.com/api/customer/close/{0}/{1}", recordId, resorderbase);
+                        string wxAddUrl = string.Format("http://rexian.zzmetro.com/api/customer/close/{0}/{1}", recordId, resorderbase);
                         HttpHelper.HttpGet(wxAddUrl);
 
                     }

web/YTSoft.BaseCallCenter.MVCWeb/Views/Default/SSO.cshtml

@@ -61,15 +61,17 @@
   <script type="text/javascript">
       $(function () {
           //任何需要执行的js特效
-          if ("@ViewBag.Return"== "success") {
+          if ("@ViewBag.Return" == "success") {
               location.href = "/Main/Index";
               helper.cookies.set('callState', 1);
               helper.cookies.set('clsCookie', "");
           }
-          else {
+          else if ("@ViewBag.Return" == "没有登录") {
               alert("这时候跳转到集团登陆页-" + "@ViewBag.Return");
               window.location = "https://portal.zzmetro.cn:4443/ZZMSsoLogin/zzmteroLogin.jsp";
           }
+          else {
+              alert("没有权限，这个没权限展示好看点");}
       })
 </script>
 </body>

web/YTSoft.BaseCallCenter.MVCWeb/YTSoft.BaseCallCenter.MVCWeb.csproj

@@ -141,7 +141,6 @@
     <Compile Include="Controllers\SMSManagerController.cs" />
     <Compile Include="Controllers\SysAdmin\DepartmentController.cs" />
     <Compile Include="Controllers\SystemManageController.cs" />
-    <Compile Include="Controllers\WebHelper.cs" />
     <Compile Include="Controllers\WorkFlowController.cs" />
     <Compile Include="Controllers\Order\WorkOrderController.cs" />
     <Compile Include="Controllers\WXInterFaceController.cs" />