From 0b26067b6cc5d531938fa79cb540a45e125261d2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 12 一月 2024 14:55:54 +0800
Subject: [PATCH] 1.App版本升级接口 2.模具清单新增、导入添加仓库、库位字段 3.MES工单查询增加明细id关联
---
VueWebCoreApi/Controllers/LoginController.cs | 127 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 10 deletions(-)
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index 41c272f..13acbec 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -24,13 +24,13 @@
private static readonly string Enterprise = AppSetting.GetAppSetting("Enterprise");
- #region[PC鐢ㄦ埛鐧诲綍]
+ #region[鐢ㄦ埛鐧诲綍(PC)]
/// <summary>
- /// PC鐢ㄦ埛鐧诲綍
+ /// 鐢ㄦ埛鐧诲綍(PC)
/// </summary>
/// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
- /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC)</param>
/// <returns></returns>
[Route(template: "LoginSave")]
[HttpGet]
@@ -80,7 +80,7 @@
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
@@ -92,7 +92,7 @@
{
mes.data = ms.token.ToString();
mes.code = "302";
- mes.Message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
+ mes.message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
}
else
{
@@ -102,7 +102,7 @@
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -110,7 +110,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
@@ -162,14 +162,14 @@
LogHelper.DbOperateLog(us.usercode, "寮哄埗涓嬬嚎", "琚己鍒朵笅绾夸簡", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "寮哄埗涓嬬嚎鎴愬姛!";
+ mes.message = "寮哄埗涓嬬嚎鎴愬姛!";
mes.data = null;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return Json(mes);
@@ -198,7 +198,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return Json(mes);
}
@@ -239,6 +239,99 @@
}
#endregion
+ #region[APP鐢ㄦ埛鐧诲綍]
+ /// <summary>
+ /// APP鐢ㄦ埛鐧诲綍
+ /// </summary>
+ /// <param name="username">鐢ㄦ埛缂栫爜</param>
+ /// <param name="password">瀵嗙爜</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(APP)</param>
+ /// <returns></returns>
+ [Route(template: "LoginAppSave")]
+ [HttpGet]
+ public JsonResult LoginAppSave(string username, string password, string usertype)
+ {
+ try
+ {
+ Dictionary<string, object> payLoad = new Dictionary<string, object>();
+ mes = LoginBLL.LoginSearch(username, password);
+ if (mes.code == "200")
+ {
+ DataTable dt = (DataTable)mes.data;
+ //jwt鐢熸垚Token鍓嶇殑鐢ㄦ埛淇℃伅
+ payLoad.Add("usercode", dt.Rows[0]["usercode"].ToString());
+ payLoad.Add("username", dt.Rows[0]["username"].ToString());
+ payLoad.Add("storg_code", dt.Rows[0]["storg_code"].ToString());
+ payLoad.Add("storg_name", dt.Rows[0]["storg_name"].ToString());
+ payLoad.Add("is_system_admin", dt.Rows[0]["is_system_admin"].ToString());
+ payLoad.Add("role_code", dt.Rows[0]["role_code"].ToString());
+ payLoad.Add("role_datapermissions", dt.Rows[0]["role_datapermissions"].ToString());
+ payLoad.Add("usertype", usertype);
+ payLoad.Add("rediskey", Enterprise + "LoginUserID" + usertype + JwtTools.FindFirstKeyByValue(payLoad, "usercode"));
+ //鑾峰彇jwt鐢熸垚token
+ mes = JwtTools.Encode(payLoad);
+
+ List<User> mss = new List<User>();
+ User ms = new User();
+ ms.usercode = dt.Rows[0]["usercode"].ToString();
+ ms.username = dt.Rows[0]["username"].ToString();
+ ms.storg_code = dt.Rows[0]["storg_code"].ToString();
+ ms.storg_name = dt.Rows[0]["storg_name"].ToString();
+ ms.is_system_admin = dt.Rows[0]["is_system_admin"].ToString();
+ ms.role_code = dt.Rows[0]["role_code"].ToString();
+ ms.role_datapermissions = dt.Rows[0]["role_datapermissions"].ToString();
+ ms.usertype = usertype;
+ ms.rediskey = Enterprise + "LoginUserID" + ms.usertype + ms.usercode;
+ ms.token = mes.data.ToString();
+ mss.Add(ms);
+
+
+ User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
+ //濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
+ if (redis.Get<User>(ms.rediskey, 0) == null)
+ {
+ //鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
+ redis.Set<User>(ms.rediskey, ms, redis.secondsTimeOut, 0);
+ //鍐欏叆鐧诲綍鎿嶄綔璁板綍
+ LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
+ mes.code = "200";
+ mes.message = "鐧诲綍鎴愬姛!";
+ mes.data = ms.token.ToString();
+ }
+ else //濡傛灉瀛樺湪
+ {
+ //鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
+ User r_loginUser = redis.Get<User>(ms.rediskey, 0);
+ //濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
+ if ((r_loginUser.rediskey).Equals(loginUser.rediskey))
+ {
+ redis.Remove(loginUser.rediskey, 0);//鍒犻櫎redis
+ redis.Set<User>(loginUser.rediskey, ms, redis.secondsTimeOut, 0);//鍐欏叆redis
+ }
+ else
+ {
+ //閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
+ redis.Set<User>(loginUser.rediskey, loginUser, redis.secondsTimeOut, 0);
+ //鍐欏叆鐧诲綍鎿嶄綔璁板綍
+ LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
+ mes.data = ms;
+ mes.code = "200";
+ mes.message = "鐧诲綍鎴愬姛!";
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.message = e.Message;
+ mes.data = null;
+ }
+
+ return Json(mes);
+ }
+ #endregion
+
#region[APP瀵嗙爜閲嶇疆]
/// <summary>
/// APP瀵嗙爜閲嶇疆
@@ -276,5 +369,19 @@
//return mes.ResponseMess(mes);
}
#endregion
+
+ #region[App鐗堟湰鍗囩骇鎺ュ彛]
+ /// <summary>
+ /// App鐗堟湰鍗囩骇鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AppUpgrade")]
+ [HttpPost]
+ public JsonResult AppUpgrade()
+ {
+ mes = LoginBLL.AppUpgrade();
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3