Selaa lähdekoodia

【业务后台】:新增用户权限相关接口

chen_yjin 6 kuukautta sitten
vanhempi
commit
fc31d9c303

+ 27 - 0
JLHHJSvr/Com/GetDept.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
+using LJLib.Net.SPI.Com;
+
+namespace JLHHJSvr.Com
+{
+    /// <summary>
+    /// 获取用户列表
+    /// </summary>
+    public sealed class GetDeptRequest : ILJRequest<GetDeptResponse>
+    {
+        public string GetApiName()
+        {
+            return "GetDept";
+        }
+        public string token { get; set; }
+    }
+
+    public sealed class GetDeptResponse : LJResponse
+    {
+        public List<u_dept> list { get; set; } 
+    }
+}

+ 0 - 3
JLHHJSvr/Com/GetPriceList.cs

@@ -19,9 +19,6 @@ namespace JLHHJSvr.Com
 
     public sealed class GetPriceListResponse : LJResponse
     {
-        /// <summary>
-        /// 自定义值
-        /// </summary>
         public List<u_pricelist> list { get; set; }
     }
 }

+ 27 - 0
JLHHJSvr/Com/GetSysFuncPwr.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
+using LJLib.Net.SPI.Com;
+
+namespace JLHHJSvr.Com
+{
+    /// <summary>
+    /// 获取用户列表
+    /// </summary>
+    public sealed class GetSysFuncPwrRequest : ILJRequest<GetSysFuncPwrResponse>
+    {
+        public string GetApiName()
+        {
+            return "GetSysFuncPwr";
+        }
+        public string token { get; set; }
+    }
+
+    public sealed class GetSysFuncPwrResponse : LJResponse
+    {
+        public List<sys_func_pwr> list { get; set; } 
+    }
+}

+ 28 - 0
JLHHJSvr/Com/GetUserInfo.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.Com.Model;
+using LJLib.Net.SPI.Com;
+
+namespace JLHHJSvr.Com
+{
+    /// <summary>
+    /// 获取主页显示信息的数据
+    /// </summary>
+    public sealed class GetUserInfoRequest : ILJRequest<GetUserInfoResponse>
+    {
+        public string GetApiName()
+        {
+            return "GetUserInfo";
+        }
+        public string token { get; set; }
+    }
+
+    public sealed class GetUserInfoResponse : LJResponse
+    {
+        #region PC端附加
+        
+        #endregion
+    }
+}

+ 2 - 1
JLHHJSvr/Com/GetUserList.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
 using LJLib.Net.SPI.Com;
 
 namespace JLHHJSvr.Com
@@ -21,6 +22,6 @@ namespace JLHHJSvr.Com
 
     public sealed class GetUserListResponse : LJResponse
     {
-        public List<User> userList { get; set; } 
+        public List<u_user_jlhprice> userList { get; set; } 
     }
 }

+ 35 - 0
JLHHJSvr/Com/Model/sys_func_pwr.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    public sealed class sys_func_pwr
+    {
+        /// <summary>
+        /// 功能id
+        /// </summary>
+        public int funcid { get; set; }
+        /// <summary>
+        /// 父级id
+        /// </summary>
+        public int parentid { get; set; }
+        /// <summary>
+        /// 主功能名称
+        /// </summary>
+        public string treename { get; set; }
+        /// <summary>
+        /// 副功能名称
+        /// </summary>
+        public string menuname { get; set; }
+        /// <summary>
+        /// 有效
+        /// </summary>
+        public int if_use { get; set; }
+        /// <summary>
+        /// 子菜单
+        /// </summary>
+        public List<sys_func_pwr> children { get; set; }
+    }
+}

+ 51 - 0
JLHHJSvr/Com/Model/u_dept.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    public sealed class u_dept
+    {
+        /// <summary>
+        /// 部门id
+        /// </summary>
+        public int deptid { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string deptname { get; set; }
+        /// <summary>
+        /// 利润率
+        /// </summary>
+        public decimal profitrate { get; set; }
+        /// <summary>
+        /// 价格表id
+        /// </summary>
+        public int pricelistid { get; set; }
+        /// <summary>
+        /// 弹簧分类id
+        /// </summary>
+        public int springtypeid { get; set; }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        public byte flag { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public string auditemp { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        public DateTime? auditdate { get; set; }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string modemp { get; set; }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? moddate { get; set; }
+    }
+}

+ 3 - 1
JLHHJSvr/Com/SaveUserList.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
 using LJLib.Net.SPI.Com;
 
 namespace JLHHJSvr.Com
@@ -17,10 +18,11 @@ namespace JLHHJSvr.Com
             return "SaveUserList";
         }
         public string token { get; set; }
-        public List<User> userList { get; set; } 
+        public List<u_user_jlhprice> userList { get; set; } 
     }
 
     public sealed class SaveUserListResponse : LJResponse
     {
+        public int empid { get; set; }
     }
 }

+ 1 - 0
JLHHJSvr/DBA/DBModle/u_user_jlhprice.cs

@@ -27,6 +27,7 @@ namespace JLHHJSvr.DBA.DBModle
         public string psw { get; set; }
         public string rightstring { get; set; }
         public string descrp { get; set; }
+        public string deptstr { get; set; }
         public string outrepstr { get; set; }
         public string pricelist_seestr { get; set; }
         public string pricelist_editstr { get; set; }

+ 1 - 3
JLHHJSvr/Excutor/DelUserListExcutor.cs

@@ -37,9 +37,7 @@ namespace JLHHJSvr.Excutor
                 {
                     try
                     {
-                        cmd.CommandText = @"DELETE st_user WHERE userid IN " + idStr;
-                        cmd.ExecuteNonQuery();
-                        cmd.CommandText = @"DELETE st_user_power WHERE userid IN " + idStr;
+                        cmd.CommandText = @"DELETE u_user_jlhprice WHERE empid IN " + idStr;
                         cmd.ExecuteNonQuery();
                         cmd.Transaction.Commit();
                     }

+ 36 - 0
JLHHJSvr/Excutor/GetDeptExcutor.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class GetDeptExcutor : ExcutorBase<GetDeptRequest, GetDeptResponse>
+    {
+        protected override void ExcuteInternal(GetDeptRequest request, object state, GetDeptResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断,请重新登录";
+                return;
+            }
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                rslt.list = new List<u_dept>();
+                DbSqlHelper.Select(cmd, "u_dept", null, null, null, 0, 0, rslt.list, null,
+                    "deptid, deptname, profitrate, pricelistid, springtypeid, flag");
+            }
+        }
+    }
+}

+ 2 - 0
JLHHJSvr/Excutor/GetPriceListExcutor.cs

@@ -31,6 +31,7 @@ namespace JLHHJSvr.Excutor
                 con.Open();
 
                 cmd.CommandText = @"SELECT ROW_NUMBER() OVER (ORDER BY u_pricelist.pricelistid) AS RowNumber,   
+                                         u_pricelist.pricelistid,   
                                          u_pricelist.pricelistname,   
                                          u_pricelist.createtime,   
                                          u_pricelist.dscrp,
@@ -48,6 +49,7 @@ namespace JLHHJSvr.Excutor
                     {
                         var item = new u_pricelist();
                         item.RowNumber = Convert.ToInt32(reader["RowNumber"]);
+                        item.pricelistid = Convert.ToInt32(reader["pricelistid"]);
                         item.pricelistname = Convert.ToString(reader["pricelistname"]);
                         item.createtime = Convert.ToDateTime(reader["createtime"]);
                         item.dscrp = Convert.ToString(reader["dscrp"]);

+ 56 - 0
JLHHJSvr/Excutor/GetSysFuncPwrExcutor.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class GetSysFuncPwrExcutor : ExcutorBase<GetSysFuncPwrRequest, GetSysFuncPwrResponse>
+    {
+        protected override void ExcuteInternal(GetSysFuncPwrRequest request, object state, GetSysFuncPwrResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断,请重新登录";
+                return;
+            }
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                rslt.list = new List<sys_func_pwr>();
+                var result = new List<sys_func_pwr>();
+                var sysList = new List<sys_func_pwr>();
+                DbSqlHelper.Select(cmd, "sys_func_pwr", "if_use = 1", null, null, 0, 0, sysList, null,
+                    "funcid, parentid, treename, menuname, if_use");
+
+                GetChildrenData(sysList, 0, ref result);
+                rslt.list = result;
+            }
+        }
+
+        public void GetChildrenData (List<sys_func_pwr>  data, int funcid, ref List<sys_func_pwr> reslist)
+        {
+            reslist = data.Where(t => t.parentid == funcid).ToList();
+            foreach (var mx in reslist)
+            {
+                var list = data.Where(t => t.parentid == mx.funcid).ToList();
+                if (list.Count > 0)
+                {
+                    var result = new List<sys_func_pwr>();
+                    GetChildrenData(data, mx.funcid, ref result);
+                    mx.children = result;
+                }
+            }
+        }
+    }
+}

+ 4 - 3
JLHHJSvr/Excutor/GetUserListExcutor.cs

@@ -6,6 +6,7 @@ using System.Text;
 using JLHHJSvr.BLL;
 using JLHHJSvr.Com;
 using JLHHJSvr.Com.Model;
+using JLHHJSvr.DBA.DBModle;
 using LJLib.DAL.SQL;
 using LJLib.Net.SPI.Server;
 
@@ -26,9 +27,9 @@ namespace JLHHJSvr.Excutor
             {
                 con.Open();
 
-                rslt.userList = new List<User>();
-                DbSqlHelper.Select(cmd, "st_user", null, null, null, 0, 0, rslt.userList, null,
-                    "userid,usercode,username,sex,tel,dscrp,opemp,opdate,modemp,moddate");
+                rslt.userList = new List<u_user_jlhprice>();
+                DbSqlHelper.Select(cmd, "u_user_jlhprice", null, null, null, 0, 0, rslt.userList, null,
+                    "empid, userid, username, rightstring, descrp, deptstr, usermode, outrepstr, pricelist_seestr, pricelist_editstr");
             }
         }
     }

+ 16 - 55
JLHHJSvr/Excutor/SaveUserListExcutor.cs

@@ -9,6 +9,7 @@ using JLHHJSvr.DBA.DBModle;
 using LJLib.DAL.SQL;
 using LJLib.Net.SPI.Server;
 using LJLib.Tools.DEncrypt;
+using LJLib.Tools.Encry;
 
 namespace JLHHJSvr.Excutor
 {
@@ -35,34 +36,9 @@ namespace JLHHJSvr.Excutor
                     rslt.ErrMsg = "用户ID异常";
                     return;
                 }
-                if (string.IsNullOrEmpty(user.usercode))
-                {
-                    rslt.ErrMsg = "用户名不能为空";
-                    return;
-                }
                 if (string.IsNullOrEmpty(user.username))
                 {
-                    rslt.ErrMsg = "真实姓名不能为空";
-                    return;
-                }
-                if (string.IsNullOrEmpty(user.sex))
-                {
-                    rslt.ErrMsg = "性别不能为空";
-                    return;
-                }
-                if (string.IsNullOrEmpty(user.tel))
-                {
-                    rslt.ErrMsg = "电话不能为空";
-                    return;
-                }
-                if (user.dscrp == null)
-                {
-                    rslt.ErrMsg = "备注信息异常";
-                    return;
-                }
-                if (user.powerList == null)
-                {
-                    rslt.ErrMsg = "权限信息列表获取异常";
+                    rslt.ErrMsg = "用户名不能为空";
                     return;
                 }
             }
@@ -76,53 +52,38 @@ namespace JLHHJSvr.Excutor
                 {
                     try
                     {
-                        var dtNow = DateTime.Now;
+                        psw_bczh3 pswhelper = new psw_bczh3();
                         foreach (var user in request.userList)
                         {
-                            cmd.CommandText = "SELECT userid FROM st_user WHERE usercode = @usercode AND userid <> @userid";
+                            cmd.CommandText = "SELECT userid FROM u_user_jlhprice WHERE userid = @userid AND empid <> @empid";
                             cmd.Parameters.Clear();
-                            cmd.Parameters.AddWithValue("@usercode", user.usercode);
                             cmd.Parameters.AddWithValue("@userid", user.userid);
+                            cmd.Parameters.AddWithValue("@empid", user.empid);
                             using (var reader = cmd.ExecuteReader())
                             {
                                 if (reader.Read())
                                 {
-                                    throw new Exception(string.Format("已存在用户名为[{0}]的记录,不能重复添加", user.usercode));
+                                    throw new Exception(string.Format("已存在用户名为[{0}]的记录,不能重复添加", user.userid));
                                 }
                             }
-                            var fields = "usercode,username,sex,tel,dscrp";
-                            if (user.userid == 0)
+                            var fields = "userid,username,descrp,rightstring,deptstr,outrepstr,pricelist_seestr,pricelist_editstr";
+                            if (user.empid == 0)
                             {
                                 //新建
-                                user.userid = BllHelper.GetID(cmd, "st_user");
-                                user.opdate = dtNow;
-                                user.opemp = tokendata.username;
-                                user.psw = DESEncrypt.Encrypt(user.usercode, "BC493812B6664BECBF44C21C3BB043C4");
-                                fields += ",psw,userid,opemp,opdate";
-                                DbSqlHelper.Insert(cmd, "st_user", null, user, fields);
+                                user.empid = BllHelper.GetID(cmd, "u_user_jlhprice");
+                                user.userid = user.userid;
+                                user.username = user.username;
+                                user.psw = pswhelper.GetEntrypt(user.userid, 0, "123457851239866");
+                                fields += ",psw,empid";
+                                DbSqlHelper.Insert(cmd, "u_user_jlhprice", null, user, fields);
                             }
                             else
                             {
                                 //修改
-                                user.moddate = dtNow;
-                                user.modemp = tokendata.username;
-                                fields += ",modemp,moddate";
-                                DbSqlHelper.Update(cmd, "st_user", null, user, "userid", fields);
-                                //删除原有权限信息
-                                cmd.CommandText = "DELETE st_user_power WHERE userid = "+user.userid;
-                                cmd.Parameters.Clear();
-                                cmd.ExecuteNonQuery();
-                            }
-                            var userPower = new st_user_power {userid = user.userid};
-                            foreach (var power in user.powerList)
-                            {
-                                if (power.inuse == 1)
-                                {
-                                    userPower.funid = power.funid;
-                                    DbSqlHelper.Insert(cmd, userPower, "userid, funid");
-                                }
+                                DbSqlHelper.Update(cmd, "u_user_jlhprice", null, user, "empid", fields);
                             }
                         }
+                        rslt.empid = request.userList[0].empid;
                         cmd.Transaction.Commit();
                     }
                     catch (Exception e)

+ 4 - 31
JLHHJSvr/GlobalVar/GlobalVar.cs

@@ -104,46 +104,19 @@ namespace JLHHJSvr
                 excutorManager = new ExcutorManager();
                 // excutorManager.AddMap("HelloWord", typeof(HelloWordRequest), new HelloWordExcutor());
                 excutorManager.AddMap("Login", typeof(LoginRequest), new LoginExcutor());//登陆
-                //excutorManager.AddMap("GetUserInfo", typeof(GetUserInfoRequest), new GetUserInfoExcutor());
                 excutorManager.AddMap("GetSysUserFileString", typeof(GetSysUserFileStringRequest), new GetSysUserFileStringExcutor());
                 excutorManager.AddMap("SetSysUserFileString", typeof(SetSysUserFileStringRequest), new SetSysUserFileStringExcutor());
 
-                excutorManager.AddMap("GetPriceList", typeof(GetPriceListRequest), new GetPriceListExcutor());
-
                 excutorManager.AddMap("CommonDynamicSelect", typeof(CommonDynamicSelectRequest), new CommonDynamicSelectExcutor());
 
-
-
-                excutorManager.AddMap("SavePermitList", typeof(SavePermitListRequest), new SavePermitListExcutor());//保存车位
-                excutorManager.AddMap("GetPermitList", typeof(GetPermitListRequest), new GetPermitListExcutor());//获取车位列表
-                excutorManager.AddMap("DelPermitList", typeof(DelPermitListRequest), new DelPermitListExcutor());//删除车位
-                excutorManager.AddMap("GetRoadList", typeof(GetRoadListRequest), new GetRoadListExcutor());//获取路段列表
-                excutorManager.AddMap("SaveRoadList", typeof(SaveRoadListRequest), new SaveRoadListExcutor());//保存路段信息
-                excutorManager.AddMap("DelRoadList", typeof(DelRoadListRequest), new DelRoadListExcutor());//删除路段列表
-                excutorManager.AddMap("GetOptionList", typeof(GetOptionListRequest), new GetOptionListExcutor());//获得选项列表
-                excutorManager.AddMap("SetOption", typeof(SetOptionRequest), new SetOptionExcutor());//设置系统选项值
                 excutorManager.AddMap("GetFileByMd5", typeof(GetFileByMd5Request), new GetFileByMd5Excutor());//根据md5获取文件
                 excutorManager.AddMap("PostFile", typeof(PostFileRequest), new PostFileExcutor());//上传文件
-                excutorManager.AddMap("GetCarList", typeof(GetCarListRequest), new GetCarListExcutor());//获取车辆信息汇总
-                excutorManager.AddMap("DelCarList", typeof(DelCarListRequest), new DelCarListExcutor());//删除车辆信息
-                excutorManager.AddMap("SaveCarList", typeof(SaveCarListRequest), new SaveCarListExcutor());//保存车辆信息
-                excutorManager.AddMap("GetBillList", typeof(GetBillListRequest), new GetBillListExcutor());//获取违停列表
                 excutorManager.AddMap("GetUserList", typeof(GetUserListRequest), new GetUserListExcutor());//获取用户列表
-                excutorManager.AddMap("SaveUserList", typeof(SaveUserListRequest), new SaveUserListExcutor());//保存用户信息
+                excutorManager.AddMap("SaveUserList", typeof(SaveUserListRequest), new SaveUserListExcutor());//保存用户列表
                 excutorManager.AddMap("DelUserList", typeof(DelUserListRequest), new DelUserListExcutor());//删除用户列表
-                excutorManager.AddMap("GetUserPower", typeof(GetUserPowerRequest), new GetUserPowerExcutor());//获取用户的权限信息
-                excutorManager.AddMap("ModPassword", typeof(ModPasswordRequest), new ModPasswordExcutor());//重置/修改用户密码
-                excutorManager.AddMap("GetDwLayout", typeof(GetDwLayoutRequest), new GetDwLayoutExcutor());
-                excutorManager.AddMap("SetDwLayout", typeof(SetDwLayoutRequest), new SetDwLayoutExcutor());
-
-
-                //APP
-                excutorManager.AddMap("GetMainInfo", typeof(GetMainInfoRequest), new GetMainInfoExcutor());//获取主页显示信息的数据
-                excutorManager.AddMap("GetPermitListQuery", typeof(GetPermitListQueryRequest), new GetPermitListQueryExcutor());//车牌号码查询
-                excutorManager.AddMap("SaveBill", typeof(SaveBillRequest), new SaveBillExcutor());//新建违停记录
-                excutorManager.AddMap("EditBill", typeof(EditBillRequest), new EditBillExcutor());//违停单处理/撤销
-                excutorManager.AddMap("TmpGetRoadList", typeof(TmpGetRoadListRequest), new TmpGetRoadListExcutor());//自主停车备案页面,获取路段列表
-                excutorManager.AddMap("TmpSavePermit", typeof(TmpSavePermitRequest), new TmpSavePermitExcutor());//自助停车备案保存
+                excutorManager.AddMap("GetSysFuncPwr", typeof(GetSysFuncPwrRequest), new GetSysFuncPwrExcutor());//获取权限列表
+                excutorManager.AddMap("GetDept", typeof(GetDeptRequest), new GetDeptExcutor());//获取部门列表
+                excutorManager.AddMap("GetPriceList", typeof(GetPriceListRequest), new GetPriceListExcutor());//获取价格表列表
 
             }
             catch (Exception ex)

+ 6 - 0
JLHHJSvr/JLHHJSvr.csproj

@@ -73,6 +73,10 @@
     <Compile Include="Com\GetDwLayout.cs" />
     <Compile Include="Com\GetFileByMd5.cs" />
     <Compile Include="Com\GetPriceList.cs" />
+    <Compile Include="Com\GetDept.cs" />
+    <Compile Include="Com\GetSysFuncPwr.cs" />
+    <Compile Include="Com\Model\sys_func_pwr.cs" />
+    <Compile Include="Com\Model\u_dept.cs" />
     <Compile Include="Com\Model\u_pricelist.cs" />
     <Compile Include="Com\SetSysUserFileString.cs" />
     <Compile Include="Com\GetOptionList.cs" />
@@ -139,6 +143,8 @@
     <Compile Include="Excutor\GetPermitListExcutor.cs" />
     <Compile Include="Excutor\GetRoadListExcutor.cs" />
     <Compile Include="Excutor\GetPriceListExcutor.cs" />
+    <Compile Include="Excutor\GetDeptExcutor.cs" />
+    <Compile Include="Excutor\GetSysFuncPwrExcutor.cs" />
     <Compile Include="Excutor\GetUserListExcutor.cs" />
     <Compile Include="Excutor\GetUserPowerExcutor.cs" />
     <Compile Include="Excutor\HelloWordExcutor.cs" />