From 43d31c2e56da8954828be4a7e027c6ad0aaf038a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 17 八月 2022 10:45:10 +0800
Subject: [PATCH] 设备点检项目、保养项目接口(查询、新增、编辑、删除、导入)
---
VueWebApi/Controllers/BasicSettingController.cs | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 288 insertions(+), 12 deletions(-)
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index f5441e8..a39a080 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
@@ -16,6 +17,7 @@
{
[RoutePrefix(prefix: "api/BasicSetting")]
[ControllerGroup("鍩虹璁剧疆","鍦ㄧ嚎鎺ュ彛")]
+ //[ChannelActionFilter]
public class BasicSettingController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -76,8 +78,10 @@
string OrganName = obj["OrganName"].ToString(); //缁勭粐鍚嶇О
string Operator = obj["Operator"].ToString(); //鎿嶄綔浜哄憳
int SupUnit = Convert.ToInt32(obj["SupUnit"].ToString());//涓婄骇鍗曚綅
+ string RightCode = obj["RightCode"].ToString(); //鑿滃崟鍔熻兘缂栫爜
+ string numvalue = obj["numvalue"].ToString(); //娴佹按鍙�
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateOrganization(OrganType, OrganCode, OrganName, Operator, SupUnit, OperType);
+ mes = BasicSettingBLL.AddUpdateOrganization(OrganType, OrganCode, OrganName, Operator, SupUnit, RightCode, numvalue, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -98,6 +102,7 @@
#endregion
+
#region[鐢ㄦ埛娓呭崟鏌ヨ]
/// <summary>
/// 鐢ㄦ埛娓呭崟鏌ヨ
@@ -105,6 +110,7 @@
/// <param name="UserCode">鐢ㄦ埛缂栫爜</param>
/// <param name="UserName">鐢ㄦ埛鍚嶇О</param>
/// <param name="StuOrg">鎵�灞炵粍缁�</param>
+ /// <param name="wagetype">宸ヨ祫绫诲瀷</param>
/// <param name="Enable">鍦ㄨ亴鐘舵��</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
@@ -113,11 +119,11 @@
/// <returns></returns>
[Route(template: "UserSearch")]
[HttpGet]
- public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage UserSearch(string UserCode = null, string UserName = null, string StuOrg = null,string wagetype=null, string Enable = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, Enable, startNum, endNum, prop, order);
+ mes = BasicSettingBLL.UserSearch(UserCode, UserName, StuOrg, wagetype, Enable, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -136,6 +142,20 @@
}
#endregion
+ #region[鐢ㄦ埛鎵�灞炵彮缁刔
+ /// <summary>
+ /// 鐢ㄦ埛鎵�灞炵彮缁�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "UserGroup")]
+ [HttpGet]
+ public HttpResponseMessage UserGroup()
+ {
+ mes = BasicSettingBLL.UserGroup();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[鐢ㄦ埛娓呭崟鏂板缂栬緫]
/// <summary>
/// 鐢ㄦ埛娓呭崟鏂板缂栬緫
@@ -146,16 +166,19 @@
[HttpPost]
public HttpResponseMessage AddUpdateUser([FromBody] JObject obj)
{
- string UserId = obj["UserId"].ToString(); //鐢ㄦ埛id(涓婚敭)
+ string UserId = obj["id"].ToString(); //鐢ㄦ埛id(涓婚敭)
string UserCode = obj["UserCode"].ToString(); //鐢ㄦ埛缂栫爜
string UserName = obj["UserName"].ToString(); //鐢ㄦ埛鍚嶇О
+ string Password = obj["Password"].ToString(); //瀵嗙爜
string Enable = obj["Enable"].ToString(); //鍦ㄨ亴鐘舵��
string StuOrg = obj["StuOrg"].ToString(); //閫夋嫨缁勭粐缂栫爜
+ string groupcode= obj["groupcode"].ToString(); //鎵�灞炵彮缁勭紪鐮�
+ string wagetype = obj["wagetype"].ToString(); //宸ヨ祫绫诲瀷
string Mobile = obj["Mobile"].ToString(); //鑱旂郴鏂瑰紡
string Email = obj["Email"].ToString(); //鐢靛瓙閭
string Operator = obj["Operator"].ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateUser(UserId, UserCode, UserName, Enable, StuOrg, Mobile, Email, Operator, OperType);
+ mes = BasicSettingBLL.AddUpdateUser(UserId, UserCode, UserName, Password, Enable, StuOrg, groupcode, wagetype, Mobile, Email, Operator, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -209,11 +232,127 @@
}
#endregion
-
-
- #region[瑙掕壊绫诲瀷鏌ヨ]
+ #region[鐢ㄦ埛娓呭崟瀵煎叆]
/// <summary>
- /// 瑙掕壊绫诲瀷鏌ヨ
+ /// 鐢ㄦ埛娓呭崟瀵煎叆
+ /// </summary>
+ /// <param name="files">涓婁紶鐢ㄦ埛娓呭崟瀵煎叆鏂囦欢</param>
+ /// <returns></returns>
+ [Route(template: "ImportUserExcel")]
+ [HttpPost]
+ public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files,string username)
+ {
+ string savePath;
+ if (files == null || files.ContentLength <= 0)
+ {
+ mes.code = "300";
+ mes.Message = "涓婁紶鏂囦欢鍐呭涓嶈兘涓虹┖!";
+ }
+ else
+ {
+ string filename = Path.GetFileName(files.FileName);
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ string fileEx = System.IO.Path.GetExtension(filename);//鑾峰彇涓婁紶鏂囦欢鐨勬墿灞曞悕
+ int Maxsize = 4000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负4M
+ string FileType = ".xls,.xlsx";//瀹氫箟涓婁紶鏂囦欢鐨勭被鍨嬪瓧绗︿覆
+
+ if (!FileType.Contains(fileEx))
+ {
+ mes.code = "300";
+ mes.Message = "鏂囦欢绫诲瀷涓嶅锛屽彧鑳藉鍏ls鍜寈lsx鏍煎紡鐨勬枃浠讹紒";
+ }
+ else
+ {
+ if (filesize >= Maxsize)
+ {
+ mes.code = "300";
+ mes.Message = "涓婁紶鏂囦欢瓒呰繃4M锛屼笉鑳戒笂浼�!";
+ }
+ else
+ {
+ string path = System.Web.HttpContext.Current.Server.MapPath("/File/excel/");
+
+ if (Directory.Exists(path) == false)//濡傛灉涓嶅瓨鍦ㄥ氨鍒涘缓file鏂囦欢澶�
+ {
+ Directory.CreateDirectory(path); //娣诲姞鏂囦欢澶�
+ }
+ savePath = Path.Combine(path, filename);
+ if (Directory.Exists(savePath) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ mes.code = "300";
+ mes.Message = "宸插瓨鍦ㄥ悓鍚嶆枃浠�";
+ }
+ else
+ {
+ files.SaveAs(savePath); //灏嗛�夋嫨鐨勬枃浠朵繚瀛樺埌鎸囧畾鏂囦欢澶逛笅
+ string FilesName = System.Web.HttpContext.Current.Server.MapPath("/File/excel/" + filename);
+ mes = BasicSettingBLL.ImportUserExcel(username,FilesName);
+ }
+ }
+ }
+ }
+ return TJson.toJson(mes);
+
+ }
+ #endregion
+
+
+ #region[鐢ㄦ埛缁勫垪琛ㄦ煡璇
+ /// <summary>
+ /// 鐢ㄦ埛缁勫垪琛ㄦ煡璇�
+ /// </summary>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "UserGroupSearch")]
+ [HttpGet]
+ public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = BasicSettingBLL.UserGroupSearch(startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勬柊澧瀅
+ /// <summary>
+ /// 鐢ㄦ埛缁勬柊澧�
+ /// </summary>
+ /// <param name="json">鐢ㄦ埛缁勬柊澧炴彁浜ゆ暟鎹�</param>
+ /// <returns></returns>
+ [Route(template: "UserGroupAdd")]
+ [HttpPost]
+ public HttpResponseMessage UserGroupAdd(List<StepDefect> json)
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ mes = BasicSettingBLL.UserGroupAdd(json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢ㄦ埛缁勫垹闄
+ /// <summary>
+ /// 鐢ㄦ埛缁勫垹闄�
+ /// </summary>
+ /// <param name="UserGrupCode">鐢ㄦ埛缁勭紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "UserGroupDelete")]
+ [HttpPost]
+ public HttpResponseMessage UserGroupDelete(string UserGrupCode)
+ {
+ mes = BasicSettingBLL.UserGroupDelete(UserGrupCode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[瑙掕壊绫诲瀷鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 瑙掕壊绫诲瀷鍒楄〃鏌ヨ
/// </summary>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
@@ -257,6 +396,28 @@
public HttpResponseMessage RoleTypeDelete(string RoleTypeCode)
{
mes = BasicSettingBLL.RoleTypeDelete(RoleTypeCode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瑙掕壊绫诲瀷涓嬫媺鎺ュ彛]
+ /// <summary>
+ /// 瑙掕壊绫诲瀷涓嬫媺鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "RoleTypeSelect")]
+ [HttpGet]
+ public HttpResponseMessage RoleTypeSelect()
+ {
+ try
+ {
+ mes = BasicSettingBLL.RoleTypeSelect();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.Message = e.Message;
+ }
return TJson.toJson(mes);
}
#endregion
@@ -347,6 +508,22 @@
}
#endregion
+ #region[瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛鏌ヨ1]
+ /// <summary>
+ /// 瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛鏌ヨ1
+ /// </summary>
+ /// <param name="rolecode">瑙掕壊缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "RoleAssociationUserTwo")]
+ [HttpGet]
+ [HiddenApi]
+ public HttpResponseMessage RoleAssociationUserTwo(string rolecode = null)
+ {
+ mes = BasicSettingBLL.RoleAssociationUserTwo(rolecode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛淇濆瓨]
/// <summary>
/// 瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛淇濆瓨
@@ -354,17 +531,116 @@
/// <param name="rolecode">瑙掕壊缂栫爜</param>
/// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
/// <returns></returns>
- [Route(template: "SaveUserAssoctRole")]
+ [Route(template: "SaveRoleAssoctUser")]
[HttpPost]
- public HttpResponseMessage SaveRoleAssociationUser(string rolecode, List<ObjectData> json)
+ public HttpResponseMessage SaveRoleAssoctUser(string rolecode, List<ObjectData> json)
{
//JavaScriptSerializer Serializer = new JavaScriptSerializer();
//List<RoleUserSubmit> objs = new List<RoleUserSubmit>();
//objs = Serializer.Deserialize<List<RoleUserSubmit>>(json);
- mes = BasicSettingBLL.SaveRoleAssociationUser(rolecode, json);
+ mes = BasicSettingBLL.SaveRoleAssoctUser(rolecode, json);
return TJson.toJson(mes);
}
#endregion
+ #region[瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ]
+ /// <summary>
+ /// 瑙掕壊娓呭崟鍏宠仈鍔熻兘鏌ヨ
+ /// </summary>
+ /// <param name="rolecode">瑙掕壊缂栫爜</param>
+ /// <param name="type">鎿嶄綔绔垎绫荤紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "RoleAssociationRight")]
+ [HttpGet]
+ public HttpResponseMessage RoleAssociationRight(string rolecode,string type=null)
+ {
+ mes = BasicSettingBLL.RoleAssociationRight(rolecode,type);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[瑙掕壊娓呭崟鍏宠仈鍔熻兘淇濆瓨]
+ /// <summary>
+ /// 瑙掕壊娓呭崟鍏宠仈鍔熻兘淇濆瓨
+ /// </summary>
+ /// <param name="rolecode">瑙掕壊缂栫爜</param>
+ /// <param name="usercode">鐧诲綍鐢ㄦ埛缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "SaveUserAssoctRight")]
+ [HttpPost]
+ public HttpResponseMessage SaveUserAssoctRight(string rolecode,string usercode, List<TreeDM> json)
+ {
+ mes = BasicSettingBLL.SaveUserAssoctRight(rolecode, usercode, json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[寰�鏉ュ崟浣嶆煡璇
+ /// <summary>
+ /// 寰�鏉ュ崟浣嶆煡璇�
+ /// </summary>
+ /// <param name="CuntUnitCode">寰�鏉ュ崟浣嶇紪鐮�</param>
+ /// <param name="CuntUnitName">寰�鏉ュ崟浣嶅悕绉�</param>
+ /// <param name="UnitAttr">鍗曚綅灞炴��</param>
+ /// <param name="CreateUser">鍒涘缓浜哄憳</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "CurrentUnitSearch")]
+ [HttpGet]
+ public HttpResponseMessage CurrentUnitSearch(string CuntUnitCode = null, string CuntUnitName = null, string UnitAttr = null, string CreateUser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = BasicSettingBLL.CurrentUnitSearch(CuntUnitCode, CuntUnitName, UnitAttr, CreateUser, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
+ /// <summary>
+ /// 寰�鏉ュ崟浣嶆柊澧炵紪杈�
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ [Route(template: "AddUpdateCurrentUnit")]
+ [HttpPost]
+ public HttpResponseMessage AddUpdateCurrentUnit([FromBody] JObject obj)
+ {
+ string unitid = obj["id"].ToString(); //寰�鏉ュ崟浣峣d(涓婚敭)
+ string unitcode = obj["unitcode"].ToString(); //寰�鏉ュ崟浣嶇紪鐮佺紪鐮�
+ string unitname = obj["unitname"].ToString(); //寰�鏉ュ崟浣嶅悕绉�
+ string mtypecode = obj["mtypecode"].ToString(); //澶栬喘渚涙柟缂栫爜
+ string btypecode = obj["btypecode"].ToString(); //澶栧崗渚涙柟缂栫爜
+ string htypecode = obj["htypecode"].ToString(); //瀹㈡埛缂栫爜
+ string person = obj["person"].ToString(); //鑱旂郴浜�
+ string contact = obj["contact"].ToString(); //鑱旂郴鏂瑰紡
+ string description = obj["description"].ToString(); //琛ュ厖鎻忚堪
+ var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
+ string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
+ mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode,htypecode, person, contact, description, usercode, OperType);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[寰�鏉ュ崟浣嶅垹闄
+ /// <summary>
+ /// 寰�鏉ュ崟浣嶅垹闄�
+ /// </summary>
+ /// <param name="unitcode">寰�鏉ュ崟浣嶇紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "DeleteCurrentUnit")]
+ [HttpPost]
+ public HttpResponseMessage DeleteCurrentUnit(string unitcode)
+ {
+ mes = BasicSettingBLL.DeleteCurrentUnit(unitcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3