From 7a0d98456b4ecaf1867cd62ecb7c8169ec15d042 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 22 六月 2022 18:20:34 +0800
Subject: [PATCH] 设备清单查询、新增、编辑、删除接口开发 设备类型(新增、删除)、设备组(新增、删除)接口开发 仓库定义(新增、编辑、删除)、库位定义(新增、编辑、删除) 存货类型、存货档案接口开发
---
VueWebApi/Controllers/LoginController.cs | 144 ++++++++++++++++++++++++++++++++----------------
1 files changed, 96 insertions(+), 48 deletions(-)
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index ddb10b5..f8e7f58 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -31,61 +31,81 @@
[HttpGet]
public HttpResponseMessage LoginSave(string username, string password)
{
- DataTable dt = LoginBLL.LoginSearch(username,password);
- if (dt.Rows.Count > 0)
+ try
{
- List<User> mss = new List<User>();
- User ms = new User();
- //ms.guid=Guid.NewGuid().ToString();
- ms.userid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
- ms.username = dt.Rows[0]["USERNAME"].ToString();
- ms.password = dt.Rows[0]["PASSWORD"].ToString();
- ms.usertype = "PC";
- mss.Add(ms);
- HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
- User loginUser = JsonConvert.DeserializeObject<User>(HttpContext.Current.Session["User"].ToString());
- //濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
- if (redis.Get<User>("LoginUserID" + ms.userid, 0) == null)
+ DataTable dt = LoginBLL.LoginSearch(username, password);
+ if (dt.Rows.Count > 0)
{
- //redis.Remove("LoginUserID" + ms.userid, 0);
- //鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>("LoginUserID" + ms.userid, ms, redis.secondsTimeOut, 0);
- mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
- mes.data = ms;
- }
- else //濡傛灉瀛樺湪
- {
- //鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>("LoginUserID" + ms.userid, 0);
- //濡傛灉session涓殑鐢ㄦ埛guid鍜宺edis涓殑鐢ㄦ埛guid鍖归厤
- if (r_loginUser.guid.Equals(loginUser.guid))
+ List<User> mss = new List<User>();
+ User ms = new User();
+ //ms.guid=Guid.NewGuid().ToString();
+ ms.userid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
+ ms.usercode = dt.Rows[0]["USERCODE"].ToString();
+ ms.username = dt.Rows[0]["USERNAME"].ToString();
+ ms.password = dt.Rows[0]["PASSWORD"].ToString();
+ ms.usertype = "PC";
+ mss.Add(ms);
+ HttpContext.Current.Session.Clear(); //浠庝細璇濈姸鎬侀泦鍚堜腑鍒犻櫎鎵�鏈夌殑閿��
+ //HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
+ //User loginUser = JsonConvert.DeserializeObject<User>(HttpContext.Current.Session["User"].ToString());
+ User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
+ //濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
+ if (redis.Get<User>("LoginUserID" + ms.userid, 0) == null)
{
- //閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>("LoginUserID" + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
+ //redis.Remove("LoginUserID" + ms.userid, 0);
+ //鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
+ redis.Set<User>("LoginUserID" + ms.userid, ms, redis.secondsTimeOut, 0);
+ //鐧诲綍淇℃伅鍐欏叆session
+ HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
+ //鍐欏叆鐧诲綍鎿嶄綔璁板綍
+ mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
mes.code = "200";
mes.Message = "鐧诲綍鎴愬姛!";
mes.data = ms;
}
- else
+ else //濡傛灉瀛樺湪
{
- mes.code = "300";
- mes.Message = "褰撳墠璐﹀彿宸茬櫥褰�!";
+ //鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
+ User r_loginUser = redis.Get<User>("LoginUserID" + ms.userid, 0);
+ //濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
+ if (r_loginUser.usercode.Equals(loginUser.usercode))
+ {
+ mes.data = ms;
+ mes.code = "300";
+ mes.Message = "褰撳墠璐﹀彿宸茬櫥褰�!";
+ }
+ else
+ {
+ //閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
+ redis.Set<User>("LoginUserID" + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
+ //鐧诲綍淇℃伅鍐欏叆session
+ HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
+ //鍐欏叆鐧诲綍鎿嶄綔璁板綍
+ mes = LoginBLL.LoginBas(ms.usercode, ms.usertype);
+ mes.code = "200";
+ mes.Message = "鐧诲綍鎴愬姛!";
+ }
}
- }
- // 閾捐〃瀛樺偍
- //RedisHelpers.AddEntityToList<List<User>>("003", mss);
- //RedisHelpers.AddEntityToList<User>("004", ms);
+ // 閾捐〃瀛樺偍
+ //RedisHelpers.AddEntityToList<List<User>>("003", mss);
+ //RedisHelpers.AddEntityToList<User>("004", ms);
- //Console.WriteLine(RedisHelpers.Get<User>("001", 1));
- //Console.WriteLine(RedisHelpers.Get<List<User>>("002", 3));
-
+ //Console.WriteLine(RedisHelpers.Get<User>("001", 1));
+ //Console.WriteLine(RedisHelpers.Get<List<User>>("002", 3));
+
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "璐﹀彿鎴栧瘑鐮佷笉姝ｇ‘!";
+ }
}
- else
+ catch (Exception e)
{
mes.code = "300";
- mes.Message = "璐﹀彿鎴栧瘑鐮佷笉姝ｇ‘!";
+ mes.Message = e.Message;
}
+
return mes.ResponseMess(mes);
}
@@ -99,26 +119,54 @@
[HttpGet]
public HttpResponseMessage LoginMenu()
{
- string usercode = HttpContext.Current.Request.Cookies["usercode"].ToString();
- mes = LoginBLL.LoginMenu(usercode);
+ try
+ {
+ var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
+ mes = LoginBLL.LoginMenu(usercode);
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.Message = e.Message;
+ }
return TJson.toJson(mes);
}
#endregion
-
+ #region[淇敼瀵嗙爜]
/// <summary>
/// 淇敼瀵嗙爜
/// </summary>
- /// <param name="username">鐢ㄦ埛鍚�</param>
+ /// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="username">鐢ㄦ埛鍚嶇О</param>
/// <param name="password">瀵嗙爜</param>
/// <param name="newpassword">鏂板瘑鐮�</param>
/// <returns></returns>
- [Route(template: "UpdateUserPassword")]
+ [ChannelActionFilter,Route(template: "UpdateUserPassword")]
[HttpPost]
- public HttpResponseMessage UpdateUserPassword(string username, string password,string newpassword)
+ public HttpResponseMessage UpdateUserPassword(string usercode, string username, string password,string newpassword)
{
- mes = LoginBLL.UpdateUserPassword(username, password,newpassword);
+ mes = LoginBLL.UpdateUserPassword(usercode,username, password,newpassword);
return mes.ResponseMess(mes);
}
+ #endregion
+
+ #region[鐧诲嚭]
+ /// <summary>
+ /// 鐧诲嚭
+ /// </summary>
+ /// <param name="userid">鐢ㄦ埛id</param>
+ /// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="username">鐢ㄦ埛鍚�</param>
+ /// <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ /// <returns></returns>
+ [Route(template: "LoginOut")]
+ [HttpPost]
+ public HttpResponseMessage LoginOut(int userid, string usercode, string username,string usertype)
+ {
+ mes = LoginBLL.LoginOut(userid,usercode, username, usertype);
+ return mes.ResponseMess(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3