代理出票合作方（加密解密--> CRUD、其他相关接口代码更改、测试（本地、生产环境)）

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -519,6 +519,7 @@ namespace OASystem.API.Controllers
         #endregion
 
         #region 代理出票合作方资料
+
         /// <summary>
         /// 代理出票合作方资料
         /// </summary>
@@ -528,52 +529,39 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryAirTicketAgent(DtoBase dto)
         {
-
-            try
+            var res_AirTicketAgents = _airTicketAgentRep.Query<Res_AirTicketAgent>(a => a.IsDel == 0).ToList();
+            if (res_AirTicketAgents.Count > 1)
             {
-                List<Res_AirTicketAgent> res_AirTicketAgents = _airTicketAgentRep.Query<Res_AirTicketAgent>(a => a.IsDel == 0).ToList();
-                if (res_AirTicketAgents.Count != 0)
+                res_AirTicketAgents = res_AirTicketAgents.OrderByDescending(a => a.CreateTime).ToList();
+                if (dto.PageSize == 0 && dto.PageIndex == 0)
                 {
-                    res_AirTicketAgents = res_AirTicketAgents.OrderByDescending(a => a.CreateTime).ToList();
-                    if (dto.PageSize == 0 && dto.PageIndex == 0)
-                    {
-                        return Ok(JsonView(true, "查询成功！", res_AirTicketAgents));
-                    }
-                    else
-                    {
-                        int count = res_AirTicketAgents.Count;
-                        float totalPage = (float)count / dto.PageSize;//总页数
-                        if (totalPage == 0) totalPage = 1;
-                        else totalPage = (int)Math.Ceiling((double)totalPage);
+                    foreach (var item in res_AirTicketAgents) EncryptionProcessor.DecryptProperties(item);
+                    return Ok(JsonView(true, "查询成功！", res_AirTicketAgents));
+                }
+                else
+                {
+                    int count = res_AirTicketAgents.Count;
+                    float totalPage = (float)count / dto.PageSize;//总页数
+                    if (totalPage == 0) totalPage = 1;
+                    else totalPage = (int)Math.Ceiling((double)totalPage);
 
-                        List<Res_AirTicketAgent> _AirTicketAgent = new List<Res_AirTicketAgent>();
-                        for (int i = 0; i < dto.PageSize; i++)
+                    var _AirTicketAgent = new List<Res_AirTicketAgent>();
+                    for (int i = 0; i < dto.PageSize; i++)
+                    {
+                        var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                        if (RowIndex < res_AirTicketAgents.Count)
                         {
-                            var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
-                            if (RowIndex < res_AirTicketAgents.Count)
-                            {
-                                _AirTicketAgent.Add(res_AirTicketAgents[RowIndex]);
-                            }
-                            else
-                            {
-                                break;
-                            }
+                            EncryptionProcessor.DecryptProperties(res_AirTicketAgents[RowIndex]);
+                            _AirTicketAgent.Add(res_AirTicketAgents[RowIndex]);
                         }
-                        return Ok(JsonView(true, "查询成功！", new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _AirTicketAgent }));
-
+                        else break;
                     }
-                }
-                else
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
+                    return Ok(JsonView(true, "查询成功！", new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _AirTicketAgent }));
 
+                }
             }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
+
+            return Ok(JsonView(false, "暂无数据！"));
         }
 
         /// <summary>
@@ -585,33 +573,12 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> OpAirTicketAgent(OpAirTicketAgentDto dto)
         {
-            try
-            {
-
-                if (dto.Account == "")
-                {
-                    return Ok(JsonView(false, "请检查代理商账户是否填写！"));
-                }
-                if (dto.Bank == "")
-                {
-                    return Ok(JsonView(false, "请检查代理商银行是否填写！"));
-                }
-                if (dto.Name == "")
-                {
-                    return Ok(JsonView(false, "请检查代理商名称是否填写正确！"));
-                }
-                Result result = await _airTicketAgentRep.OpAirTicketAgent(dto);
-                if (result.Code != 0)
-                {
-                    return Ok(JsonView(false, result.Msg));
-                }
-                return Ok(JsonView(true, result.Msg));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
+            if (string.IsNullOrEmpty(dto.Account)) return Ok(JsonView(false, "请检查代理商账户是否填写！"));
+            if (string.IsNullOrEmpty(dto.Bank)) return Ok(JsonView(false, "请检查代理商银行是否填写！"));
+            if (string.IsNullOrEmpty(dto.Name)) return Ok(JsonView(false, "请检查代理商名称是否填写正确！"));
+            Result result = await _airTicketAgentRep.OpAirTicketAgent(dto);
+            if (result.Code != 0) return Ok(JsonView(false, result.Msg));
+            return Ok(JsonView(true, result.Msg));
         }
 
         /// <summary>
@@ -622,20 +589,9 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> DelAirTicketAgent(DelBaseDto dto)
         {
-            try
-            {
-                var res = await _airTicketAgentRep.SoftDeleteByIdAsync<Res_AirTicketAgent>(dto.Id.ToString(), dto.DeleteUserId);
-                if (!res)
-                {
-                    return Ok(JsonView(false, "删除失败"));
-                }
-                return Ok(JsonView(true, "删除成功！"));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
+            var res = await _airTicketAgentRep.SoftDeleteByIdAsync<Res_AirTicketAgent>(dto.Id.ToString(), dto.DeleteUserId);
+            if (!res) return Ok(JsonView(false, "删除失败"));
+            return Ok(JsonView(true, "删除成功！"));
         }
 
         #endregion

OASystem/OASystem.Domain/Dtos/Resource/OpAirTicketAgentDto.cs

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,14 +23,17 @@ namespace OASystem.Domain.Dtos.Resource
         /// <summary>
         /// 代理商名称
         /// </summary>
+        [Encrypted]
         public string Name { get; set; }
         /// <summary>
         /// 代理商账户
         /// </summary>
+        [Encrypted]
         public string Account { get; set; }
         /// <summary>
         /// 代理商银行
         /// </summary>
+        [Encrypted]
         public string Bank { get; set; }
         /// <summary>
         /// 创建者Id
@@ -38,6 +42,7 @@ namespace OASystem.Domain.Dtos.Resource
         /// <summary>
         /// 备注
         /// </summary>
+        [Encrypted]
         public string Remark { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Resource/Res_AirTicketAgent.cs

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -15,17 +16,20 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 代理商名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [Encrypted]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(200)")]
         public string Name { get; set; }
         /// <summary>
         /// 代理商账户
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [Encrypted]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(200)")]
         public string Account { get; set; }
         /// <summary>
         /// 代理商银行
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [Encrypted]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(200)")]
         public string Bank { get; set; }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Resource/AirTicketAgentRepository.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.AesEncryption;
 using OASystem.Domain.Dtos.Resource;
 using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels.Resource;
@@ -22,52 +23,45 @@ namespace OASystem.Infrastructure.Repositories.Groups
         public async Task<Result> OpAirTicketAgent(OpAirTicketAgentDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
-            try
+
+            EncryptionProcessor.EncryptProperties(dto);
+
+            if (dto.Status == 1)//添加
             {
-                if (dto.Status == 1)//添加
+                var res_AirTicket = await Query<Res_AirTicketAgent>(a => a.IsDel == 0 && a.Account == dto.Account && a.Name == dto.Name && a.Bank == dto.Bank).FirstAsync();
+                if (res_AirTicket != null)
                 {
-                   Res_AirTicketAgent res_AirTicket=await Query<Res_AirTicketAgent>(a=>a.IsDel==0 && a.Account==dto.Account && a.Name==dto.Name && a.Bank==dto.Bank).FirstAsync();
-                    if (res_AirTicket!=null)
-                    {
-                        return result = new Result() { Code = -1, Msg = "该代理商已存在，请勿重复添加！" };
-                    }
-                    else
-                    {
-                        Res_AirTicketAgent _AirTicketAgent = _mapper.Map<Res_AirTicketAgent>(dto);
-                        int id = await AddAsyncReturnId(_AirTicketAgent);
-                        if (id == 0)
-                        {
-                            return result = new Result() { Code = -1, Msg = "添加失败！" };
-
-                        }
-                        return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
-                    }
+                    return result = new Result() { Code = -1, Msg = "该代理商已存在，请勿重复添加！" };
                 }
-                else if (dto.Status == 2)//修改
+                else
                 {
-                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Res_AirTicketAgent
+                    var _AirTicketAgent = _mapper.Map<Res_AirTicketAgent>(dto);
+                    int id = await AddAsyncReturnId(_AirTicketAgent);
+                    if (id == 0)
                     {
-                        Name = dto.Name,
-                        Bank = dto.Bank,
-                        Account = dto.Account,
-                        CreateUserId = dto.CreateUserId,
-                        Remark = dto.Remark,
-                    });
-                    if (!res)
-                    {
-                        return result = new Result() { Code = -1, Msg = "修改失败！" };
+                        return result = new Result() { Code = -1, Msg = "添加失败！" };
+
                     }
-                    return result = new Result() { Code = 0, Msg = "修改成功！" };
-                }
-                else
-                {
-                    return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                    return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
                 }
             }
-            catch (Exception ex)
+            else if (dto.Status == 2)//修改
             {
-                return result = new Result() { Code = -2, Msg = "程序错误！" };
+                bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Res_AirTicketAgent
+                {
+                    Name = dto.Name,
+                    Bank = dto.Bank,
+                    Account = dto.Account,
+                    CreateUserId = dto.CreateUserId,
+                    Remark = dto.Remark,
+                });
+                if (!res)
+                {
+                    return result = new Result() { Code = -1, Msg = "修改失败！" };
+                }
+                return result = new Result() { Code = 0, Msg = "修改成功！" };
             }
+            return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
         }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Resource/MediaSuppliersRepository.cs

@@ -112,7 +112,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                .ToList();
             }
 
-            var search = dto.Search;
+            var search = AesEncryptionHelper.Encrypt(dto.Search);
             RefAsync<int> total = 0;
             var infos = await _sqlSugar.Queryable<Res_MediaSuppliers>()
                 .LeftJoin<Sys_Users>((ms, u) => ms.CreateUserId == u.Id)