提交更改，上传

代码/MadRunFabric.SignTokenApi/SignTokenApi/Controllers/UserAccountController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using MadRunFabric.Common;
@@ -10,6 +11,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
+using NPOI.SS.Formula.Functions;
 using SignTokenApi.IRepositories;
 using SignTokenApi.Model.Dto;
 using SignTokenApi.Model.Input;
@@ -177,7 +179,7 @@ namespace SignTokenApi.Controllers
             model.birthday = input.birthday;
             model.call_type = input.call_type;
             model.delete_flag = false;
-            //model.dept_id = input.dept_id;
+            model.dept_id = input.dept_id;
             model.extensionnumber = input.extensionnumber;
             model.group = input.group;
             model.groupid = input.groupid;
@@ -559,5 +561,82 @@ namespace SignTokenApi.Controllers
 
             return Success("根据条件获取坐席数据成功", agentlist);
         }
+
+        /// <summary>
+        /// 上传文件并将设备信息导入数据库
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("importexcel")]
+        public async Task<IActionResult> ImportExcel(int headrow = 0)
+        {
+            string usercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+
+            Microsoft.AspNetCore.Http.IFormFile _upfile = Request.Form.Files[0];
+            if (!_upfile.ContentType.Equals("application/vnd.ms-excel") && !_upfile.ContentType.Equals("application/x-xls") && !_upfile.ContentType.Equals("application/x-xlsx") && !_upfile.ContentType.Equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") && !_upfile.ContentType.Equals("application/octet-stream"))
+                return Error($"请正确上传Excel文件：file.ContentType={_upfile.ContentType}");
+
+            NPOIHelper npoi = new NPOIHelper();
+            var dtExcel = npoi.ExcelToTable1(_upfile, headrow);
+            int num = dtExcel.Rows.Count;
+            var cols = dtExcel.Columns;
+            int colnum = cols.Count;
+
+            string dbkeys = _configuration["upload:dbkeys"].ToString();
+            string[] dbcols = dbkeys.Split(",");
+            string errmsg = string.Empty;
+
+            if (num > 0)
+            {
+                int index = 1;
+                foreach (System.Data.DataRow dr in dtExcel.Rows)
+                {
+                    Sys_User_Account model = new Sys_User_Account();
+
+                    model.create_time = DateTime.Now;
+                    model.create_user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+                    model.lock_flag = true;//导入禁用，需要重新编辑
+                    model.dept_id = "import";
+                    var dbcolslist = dbcols.ToList();
+
+                    Type t = model.GetType();
+                    PropertyInfo[] PropertyList = t.GetProperties();
+
+                    foreach (PropertyInfo item in PropertyList)
+                    {
+                        if (dbcolslist.Contains(item.Name))
+                        {
+                            object v = Convert.ChangeType(dr[dbcolslist.IndexOf(item.Name)].ToString(), item.PropertyType);
+                            item.SetValue(model, v, null);
+                        }
+                    }
+
+                    bool b = await _sys_user_accountRepository.Add(model);
+                    if (!b)
+                    {
+                        if (!string.IsNullOrEmpty(errmsg))
+                        {
+                            errmsg = errmsg + "\r\n第" + index + "行导入失败！";
+                        }
+                        else
+                        {
+                            errmsg = "第" + index + "行导入失败！";
+                        }
+                    }
+                    index++;
+                }
+            }
+            else
+            {
+                return Error("文件中无数据");
+            }
+
+            if (!string.IsNullOrEmpty(errmsg))
+            {
+                //删除已导入的部分
+                return Error(errmsg);
+            }
+
+            return Success("导入成功");
+        }
     }
 }

代码/MadRunFabric.SignTokenApi/SignTokenApi/Model/Input/UserAccountInput.cs

@@ -153,7 +153,7 @@ namespace SignTokenApi.Model.Input
         public int? call_type { get; set; } = 0;
 
         /// <summary>
-        /// 团队id
+        /// 团队id/岗位类型
         /// </summary>
         public string team_id { get; set; } = "";
 

代码/MadRunFabric.SignTokenApi/SignTokenApi/appsettings.Development.json

@@ -27,6 +27,13 @@
     "Defaultdatabase": "5",
     "InstanceName": "test"
   },
+  "upload": {
+    "url": "http://yunwei.nuodajituan.com:28000/fileserverapi/api/upload",
+    "params": "uploadtype=excel",
+    "mbname": "工号.xlsx",
+    "mbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist",
+    "dbkeys": "id,usercode,username,sex,mobile,remark,team_id,postlist,projectlist"
+  },
   "allprojectrole": "YWFJL|YWJL|YWZJ|CJGL|XTWH", //查看所有项目
   "spring": {
     "application": {

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Controllers/TestUserTypeController.cs

@@ -21,8 +21,6 @@ using System.ServiceModel;
 using System.Collections;
 using System.Net.Http;
 using System.Reflection;
-using com.pkuhit.iihip.sdk;
-using com.pkuhit.iihip.sdk.message;
 using System.Net.Http.Headers;
 using Newtonsoft.Json;
 using System.Data;