Merge branch 'develop' of…

Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_local_platform into develop-zhaojw

WebApiNET6-master/APIs/Controllers/BaseInfoController.cs

@@ -13,6 +13,9 @@ using Newtonsoft.Json;
 using Services;
 using Services.Interface;
 using SqlSugar;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
 using static Microsoft.AspNetCore.Razor.Language.TagHelperMetadata;
 
 namespace APIs.Controllers
@@ -37,6 +40,94 @@ namespace APIs.Controllers
         }
 
         /// <summary>
+        /// 人员照片上传
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+
+        public async Task<ApiResult> UploadPicture([FromBody] PictureReq req)
+        {
+            try
+            {
+                var police = await _policeService.QueryOne(p => p.id == req.policeId);
+
+                //警员不存在
+                if(police == null)
+                {
+                    var error = new ApiResult
+                    {
+                        code = ResultCode.POLICE_ERROR.Code,
+                        msg = ResultCode.POLICE_ERROR.Msg,
+                    };
+                    return error;
+                }
+
+                //存储图片
+                byte[] imageBytes = req.picture;
+                string filePath = "";
+                using (MemoryStream memoryStream = new MemoryStream(imageBytes))
+                {
+                    using (Image image = Image.FromStream(memoryStream))
+                    {
+                        //图片格式
+                        string extension = string.Empty;
+                        ImageFormat imageFormat = image.RawFormat;
+
+                        if (imageFormat.Equals(ImageFormat.Jpeg))
+                        {
+                            extension = "jpg";
+                        }
+                        else if (imageFormat.Equals(ImageFormat.Png))
+                        {
+                            extension = "png";
+                        }
+                        else if (imageFormat.Equals(ImageFormat.Gif))
+                        {
+                            extension = "gif";
+                        }
+                        if (string.IsNullOrEmpty(extension))
+                        {
+                            extension = "jpg";
+                        }
+
+                        filePath = $"Pictures/{req.policeId}.jpg"; // 图片保存路径
+                        image.Save(filePath);
+                    }
+                }
+
+                //更新警员照片地址
+                police.picUrl = filePath;
+                police.updateTime = DateTime.Now;
+                bool rs = await _policeService.Update(police);
+
+                var src = rs ? new ApiResult
+                {
+                    code = ResultCode.OPERATE_SUCCESS.Code,
+                    msg = ResultCode.OPERATE_SUCCESS.Msg,
+                    data = ""
+                } : new ApiResult
+                {
+                    code = ResultCode.OPERATE_FAILED.Code,
+                    msg = ResultCode.OPERATE_FAILED.Msg,
+                    data = ""
+                };
+
+                return src;
+            }
+            catch (Exception ex)
+            {
+                var error = new ApiResult
+                {
+                    code = ResultCode.OPERATE_FAILED.Code,
+                    msg = ex.Message,
+
+                };
+                return error;
+            }
+
+        }
+
+        /// <summary>
         /// 新增基础信息
         /// </summary>
         /// <param name="req"></param>
@@ -317,5 +408,6 @@ namespace APIs.Controllers
             };
             return JsonConvert.SerializeObject(src);
         }
+
     }
 }

WebApiNET6-master/APIs/Req/FingerFaceReq.cs

@@ -2,8 +2,8 @@
 {
 
     public class InfoListReq
-    { 
-    public List<FingerFace> infoList { get; set; }
+    {
+        public List<FingerFace> infoList { get; set; }
     }
     public class FingerFace
     {

WebApiNET6-master/APIs/Req/PictureReq.cs

+namespace APIs.Req
+{
+    public class PictureReq
+    {
+        public string policeId { get; set; }
+        public byte[] picture { get; set; }
+    }
+}

WebApiNET6-master/Models/Table/Police.cs

@@ -22,6 +22,8 @@ namespace Models.Table
         public String policecode { get; set; }
 
         public String? phone { get; set; }
+        [SugarColumn(ColumnName = "pic_url")]
+        public String? picUrl { get; set; }
         [SugarColumn(ColumnName = "id_card")]
         public String? idCard { get; set; }
         public String? sex { get; set; }