Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -912,7 +912,7 @@ namespace OASystem.API.Controllers
                     if (doc.Range.Bookmarks["Team"] != null)
                     {
                         Bookmark mark = doc.Range.Bookmarks["Team"];
-                        mark.Text = _DelegationInfo.VisitCountry == null ? "" : _DelegationInfo.VisitCountry.ToString();
+                        mark.Text = _DelegationInfo.VisitCountry == null ? "" : _DelegationInfo.VisitCountry.Replace("|","、").ToString();
                     }
 
                     //付款日期
@@ -946,7 +946,8 @@ namespace OASystem.API.Controllers
 
                     //文件名
                     string strFileName = _DelegationInfo.TeamName + "-收款账单.docx";
-
+                    //去水印
+                    new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
                     doc.Save(AppSettingsHelper.Get("WordBasePath") + "ForeignReceivables/File/" + strFileName);
                     string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/ForeignReceivables/File/" + strFileName;
 
@@ -976,7 +977,6 @@ namespace OASystem.API.Controllers
                         }
                     }
 
-
                     //数据源
                     List<Grp_DayAndCost> dac1 = _DayAndCosts.Where(it => it.Type == 1).ToList(); //住宿费
                     List<Grp_DayAndCost> dac2 = _DayAndCosts.Where(it => it.Type == 2).ToList(); //伙食费
@@ -1029,7 +1029,7 @@ namespace OASystem.API.Controllers
                         bookmarkArr.Add("ClientUnit", ClientItem.Key); //单位
                         bookmarkArr.Add("VisitStartDate", _DelegationInfo.VisitStartDate.ToString("yyyy年MM月dd日"));//出发日期
                         bookmarkArr.Add("name", string.Join(",", ClientItem.Select(x => x.Name).ToArray()).TrimEnd(','));//全部人员信息
-                        bookmarkArr.Add("VisitCountry", _DelegationInfo.VisitCountry);//出访国家
+                        bookmarkArr.Add("VisitCountry", _DelegationInfo.VisitCountry.Replace("|","、"));//出访国家
                         bookmarkArr.Add("dayTime", DateTime.Now.ToString("yyyy年MM月dd日"));//今天日期
 
                         var ClientItemList = ClientItem.ToList();
@@ -1050,7 +1050,7 @@ namespace OASystem.API.Controllers
                             decimal airPrice = client.AirType == 460 ? _EnterExitCosts.AirJJ : _EnterExitCosts.AirGW;
                             decimal AllPrice = airPrice + _EnterExitCosts.CityTranffic + dac1.Sum(x => x.SubTotal) + dac2.Sum(x => x.SubTotal) +
                                                dac3.Sum(x => x.SubTotal) + dac4.Sum(x => x.SubTotal) + _EnterExitCosts.Visa + _EnterExitCosts.Safe +
-                                               _EnterExitCosts.Service;
+                                               +_EnterExitCosts.YiMiao + _EnterExitCosts.YiMiao + _EnterExitCosts.Ticket + _EnterExitCosts.Service;
                             WordAllPrice += AllPrice;
 
                             UsersTop += firstName + "出访费用为￥" + AllPrice.ToString("#0.00") + "元、";
@@ -1184,8 +1184,42 @@ namespace OASystem.API.Controllers
                             TeableBookmarkArr.Add("hsinfo", hsinfo); //伙食费详情
                             TeableBookmarkArr.Add("gz", dac3.Sum(x => Convert.ToDecimal(x.SubTotal)).ToString("#0.00") + " 元"); //公杂费
                             TeableBookmarkArr.Add("gzinfo", gzinfo); //公杂费详情
-                            TeableBookmarkArr.Add("qt", (_EnterExitCosts.Visa + _EnterExitCosts.Safe).ToString("#0.00") + " 元");//其他费用
-                            TeableBookmarkArr.Add("qtinfo", $"（签证费{_EnterExitCosts.Visa.ToString("#0.00")}元、保险{_EnterExitCosts.Safe.ToString("#0.00")}元等费用）");//其他费用第二列
+
+                            string otherFeestr = "";
+                            decimal otherFee = 0.00M;
+                            if (_EnterExitCosts.Visa > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.Visa;
+                                otherFeestr += $"签证费{_EnterExitCosts.Visa.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.YiMiao > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.YiMiao;
+                                otherFeestr += $"疫苗费{_EnterExitCosts.YiMiao.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.HeSuan > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.HeSuan;
+                                otherFeestr += $"核酸检测费{_EnterExitCosts.HeSuan.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.Safe > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.Safe;
+                                otherFeestr += $"保险费{_EnterExitCosts.Safe.ToString("#0.00")}元、";
+                            }
+                            if (_EnterExitCosts.Ticket > 0.00M)
+                            {
+                                otherFee += _EnterExitCosts.Ticket;
+                                otherFeestr += $"参展门票费{_EnterExitCosts.Ticket.ToString("#0.00")}元、";
+                            }
+                            if (otherFeestr.Length > 0) {
+                                otherFeestr = otherFeestr.Substring(0, otherFeestr.Length - 1);
+                                otherFeestr += "等费用";
+                            }
+
+                            TeableBookmarkArr.Add("qt", otherFee.ToString("#0.00") + " 元");//其他费用
+                            TeableBookmarkArr.Add("qtinfo", otherFeestr);//其他费用第二列
+
                             TeableBookmarkArr.Add("fw", _EnterExitCosts.Service.ToString("#0.00") + "元/人");//服务费
                             TeableBookmarkArr.Add("AllPrice", AllPrice.ToString("#0.00") + "元/人");//表格合计费用
                             string airStr = client.AirType == 460 ? "经济舱" : client.AirType == 458 ? "公务舱" : "";
@@ -1227,6 +1261,8 @@ namespace OASystem.API.Controllers
                         }
                         //MemoryStream outSteam = new MemoryStream();
                         string filsPath = AppSettingsHelper.Get("WordBasePath") + $"ForeignReceivables/File/{ClientItem.Key.Replace("\n", "")}.docx";
+                        //去水印
+                        new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
                         doc.Save(filsPath);
                         filesToZip.Add(filsPath);
                         //streams.Add(ClientItem.Key + ".docx", outSteam.ToArray());

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -7285,6 +7285,19 @@ namespace OASystem.API.Controllers
                     }
                     else
                     {
+                        #region 企微通知对应岗位用户
+                        try
+                        {
+                            AppNoticeLibrary.SendUserMsg_GroupShare_ToJob(dto.Diid);
+                        }
+                        catch (Exception ex)
+                        {
+
+                        }
+                        
+
+                        #endregion
+
                         msg = "通知成功,其他模块操作人员可见此成本信息！";
                     }
 

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -15,6 +15,7 @@ using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.ViewModels.PersonnelModule;
 using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Infrastructure.Repositories.PersonnelModule;
+using Org.BouncyCastle.Asn1.Ocsp;
 using StackExchange.Redis;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -1707,7 +1708,13 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> Test_QIYEWX(PostTourClientListDownloadFile _dto)
         {
-            DeleReminderMessage.PostMessageByWebhook();
+            //List<string> templist = new List<string>() { 234.ToString() };
+            //await AppNoticeLibrary.SendUserMsg_GroupStatus_AuditFee(14090, templist, QiyeWeChatEnum.TestChat);
+
+            await AppNoticeLibrary.SendUserMsg_GroupShare_ToJob(_dto.DiId); ;
+
+
+            //DeleReminderMessage.PostMessageByWebhook();
             //GroupStatus_UserSimplelistView list = await _qiYeWeChatApiService.GroupStatus_GetUserList();
 
             //创建群聊

OASystem/OASystem.Api/Controllers/TencentOCRController.cs

@@ -1,15 +1,24 @@
 using Aspose.Cells;
+using Aspose.Words;
+using Aspose.Words.Fonts;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using NPOI.HPSF;
 using OASystem.API.OAMethodLib.File;
 //using OASystem.API.OAMethodLib.NPOI;
 using OASystem.API.OAMethodLib.TencentCloudAPI;
 using OASystem.API.OAMethodLib.YouDaoAPI;
 using OASystem.Domain.Dtos.CRM;
+using OASystem.Domain.Dtos.QiYeWeChat;
 using OASystem.Domain.Dtos.Tencent;
+using OASystem.Domain.ViewModels.OCR;
+using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Domain.ViewModels.TencentOCR;
 using OASystem.Infrastructure.Repositories.CRM;
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Utilities.Encoders;
 using StackExchange.Redis;
+using System.Collections.Generic;
+using System.Data;
 using System.Net.NetworkInformation;
 using TencentCloud.Ocr.V20181119.Models;
 using Ubiety.Dns.Core;
@@ -34,6 +43,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 通用印刷体
+        /// 文档下载
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -54,7 +64,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var gbData =  TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
+            var gbData = await TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
 
             if (gbData.Code != 0)
             {
@@ -66,13 +76,42 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(gbData.Msg));
             }
 
-            return Ok(JsonView(gbData.Data));
+            #region word下载
+
+            GeneralBasicOCRResponse res = gbData.Data as GeneralBasicOCRResponse;
+
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+            string fileName = "通用印刷体";
+            string content = $"{fileName}\r\n\r\n";
+            foreach (var view in res.TextDetections)
+            {
+                content += $"Content：{view.DetectedText}\r\n\r\n";
+            }
+
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+
+            doc.Save(outputPath);
+            string url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+
+            #endregion
+
+            return Ok(JsonView(true, "操作成功", new { dataSource = res, url = url }));
         }
 
 
         /// <summary>
         /// 身份证识别(国徽面/反面)
-        /// 获取身份证返回数据
+        /// 文档下载
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -93,7 +132,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var idCardData = TencentOCRTools.GetOCR((int)TencentOCREnum.IDCard, dto);
+            var idCardData =await TencentOCRTools.GetOCR((int)TencentOCREnum.IDCard, dto);
 
             if (idCardData.Code != 0)
             {
@@ -174,7 +213,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 户口簿识别
-        /// 获取户口簿返回数据 
+        ///  文档下载 ?
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -188,7 +227,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var residenceBookData = TencentOCRTools.GetOCR((int)TencentOCREnum.ResidenceBooklet, dto);
+            var residenceBookData = await TencentOCRTools.GetOCR((int)TencentOCREnum.ResidenceBooklet, dto);
 
             if (residenceBookData.Code != 0)
             {
@@ -200,8 +239,54 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(residenceBookData.Msg));
             }
 
+            #region Feil Down
 
-            return Ok(JsonView(residenceBookData.Data));
+            BizLicenseOCRResponse res = residenceBookData.Data as BizLicenseOCRResponse;
+
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+
+            string fileName = "户口簿识别";
+            string content = $"{fileName}\r\n\r\n";
+
+            if (res != null)
+            {
+                content += $"公司名称：{res.Name}\r\n\r\n";
+                content += $"统一社会信用代码（三合一之前为注册号）：{res.RegNum}\r\n\r\n";
+                content += $"注册资本：{res.Capital}\r\n\r\n";
+                content += $"法人代表：{res.Person}\r\n\r\n";
+                content += $"地址：{res.Address}\r\n\r\n";
+                content += $"经营范围：{res.Business}\r\n\r\n";
+                content += $"主题类型：{res.Type}\r\n\r\n";
+                content += $"营业期限：{res.Period}\r\n\r\n";
+                content += $"组成形式：{res.ComposingForm}\r\n\r\n";
+                content += $"成立日期：{res.SetDate}\r\n\r\n";
+            }
+
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+
+            doc.Save(outputPath);
+
+            string url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+
+
+            var data = new { 
+                dataSource = residenceBookData.Data,
+                url = url
+            };
+            #endregion
+
+
+            return Ok(JsonView(data));
         }
 
         /// <summary>
@@ -220,7 +305,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var residenceBookData = TencentOCRTools.GetOCR((int)TencentOCREnum.BizLicense, dto);
+            var residenceBookData = await TencentOCRTools.GetOCR((int)TencentOCREnum.BizLicense, dto);
 
             if (residenceBookData.Code != 0)
             {
@@ -252,7 +337,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var occData = TencentOCRTools.GetOCR((int)TencentOCREnum.OrgCodeCert, dto);
+            var occData = await TencentOCRTools.GetOCR((int)TencentOCREnum.OrgCodeCert, dto);
 
             if (occData.Code != 0)
             {
@@ -269,7 +354,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 行驶证识别
-        /// 获取行驶证返回数据 
+        /// 文档下载 
         /// CardSide=0 主页正面（有红色印章的一面），CardSide=1 行驶证副页正面（有号码号牌的一面），CardSide=2 行驶证主页正面和副页正面。
         /// </summary>
         /// <param name="dto"></param>
@@ -286,22 +371,119 @@ namespace OASystem.API.Controllers
 
             var vehicleLicenseData = TencentOCRTools.GetOCR((int)TencentOCREnum.VehicleLicense, dto);
 
-            if (vehicleLicenseData.Code != 0)
+            if (vehicleLicenseData.Result.Code != 0)
             {
-                return Ok(JsonView(vehicleLicenseData.Msg));
+                return Ok(JsonView(vehicleLicenseData.Result.Msg));
             }
 
-            if (vehicleLicenseData.Data == null)
+            if (vehicleLicenseData.Result.Data == null)
             {
-                return Ok(JsonView(vehicleLicenseData.Msg));
+                return Ok(JsonView(vehicleLicenseData.Result.Msg));
             }
 
-            return Ok(JsonView(vehicleLicenseData.Data));
+
+            #region word下载
+
+            VehicleLicenseOCRResponse vlData = vehicleLicenseData.Result.Data as VehicleLicenseOCRResponse;
+
+            string url = ""; 
+            string fileName = "";
+            string content = "";
+            dynamic data = null;
+
+            try
+            {
+                //Aspose.Words.License lic = new Aspose.Words.License();
+                //lic.SetLicense("Aspose.Wrods.lic");//破解版不用设置license
+
+                if (dto.CardSide == 0) // 正面
+                {
+                    fileName = "行驶证识别-主页";
+                    content = $"{fileName}\r\n\r\n";
+                    TextVehicleFront frontInfo = vlData.FrontInfo;
+                    Document doc = new Document();
+                    DocumentBuilder builder = new DocumentBuilder(doc);
+                    if (frontInfo != null)
+                    {
+                        data = frontInfo;
+                        content += $"号牌号码：{frontInfo.PlateNo ?? "Unknown"}\r\n\r\n";
+                        content += $"车辆类型：{frontInfo.VehicleType ?? "Unknown"}\r\n\r\n";
+                        content += $"所有人：{frontInfo.Owner ?? "Unknown"}\r\n\r\n";
+                        content += $"住址：{frontInfo.Address ?? "Unknown"}\r\n\r\n";
+                        content += $"使用性质：{frontInfo.UseCharacter ?? "Unknown"}\r\n\r\n";
+                        content += $"品牌型号：{frontInfo.Model ?? "Unknown"}\r\n\r\n";
+                        content += $"车辆识别代号：{frontInfo.Vin ?? "Unknown"}\r\n\r\n";
+                        content += $"发动机号码：{frontInfo.EngineNo ?? "Unknown"}\r\n\r\n";
+                        content += $"注册日期：{frontInfo.RegisterDate ?? "Unknown"}\r\n\r\n";
+                        content += $"发证日期：{frontInfo.IssueDate ?? "Unknown"}\r\n\r\n";
+                        content += $"印章：{frontInfo.Seal ?? "Unknown"}\r\n\r\n";
+                    }
+                    builder.Write(content);
+
+                    string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+                    string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+                    string outputPath = Path.Combine(outputDir, outputFile);
+
+                    if (!Directory.Exists(outputDir))
+                    {
+                        Directory.CreateDirectory(outputDir);
+                    }
+                    //去水印
+                    new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
+                    doc.Save(outputPath);
+                    url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+                }
+                else if (dto.CardSide == 1) //反面
+                {
+                    TextVehicleBack backInfo = vlData.BackInfo;
+                    fileName = "行驶证识别-副页";
+                    content = $"{fileName}\r\n\r\n";
+                    Document doc = new Document();
+                    DocumentBuilder builder = new DocumentBuilder(doc);
+                    if (backInfo != null)
+                    {
+                        data = backInfo;
+                        content += $"号牌号码：{backInfo.PlateNo ?? "Unknown"}\r\n\r\n";
+                        content += $"档案编号：{backInfo.FileNo ?? "Unknown"}\r\n\r\n";
+                        content += $"核定人数：{backInfo.AllowNum ?? "Unknown"}\r\n\r\n";
+                        content += $"总质量：{backInfo.TotalMass ?? "Unknown"}\r\n\r\n";
+                        content += $"整备质量：{backInfo.CurbWeight ?? "Unknown"}\r\n\r\n";
+                        content += $"核定载质量：{backInfo.LoadQuality ?? "Unknown"}\r\n\r\n";
+                        content += $"外廓尺寸：{backInfo.ExternalSize ?? "Unknown"}\r\n\r\n";
+                        content += $"备注：{backInfo.Marks ?? "Unknown"}\r\n\r\n";
+                        content += $"检验记录：{backInfo.Record ?? "Unknown"}\r\n\r\n";
+                        content += $"准牵引总质量：{backInfo.TotalQuasiMass ?? "Unknown"}\r\n\r\n";
+                    }
+                    builder.Write(content);
+
+                    string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+                    string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+                    string outputPath = Path.Combine(outputDir, outputFile);
+
+                    if (!Directory.Exists(outputDir))
+                    {
+                        Directory.CreateDirectory(outputDir);
+                    }
+
+                    doc.Save(outputPath);
+                    url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+                }
+
+                #endregion
+
+                return Ok(JsonView(true, "操作成功", new { dataSource = data, url = url }));
+            }
+            catch (Exception ex)
+            {
+
+                return Ok(JsonView(false, $"InnerException：{ex.InnerException?.Message ?? "Unknown"} ErrMsg：{ex.Message}"));
+            }
+            
         }
 
         /// <summary>
-        /// 房产证识别
-        /// 获取房产证返回数据 
+        /// 房产证识别(腾讯OCR 未找到)
+        /// 返回数据 
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -315,7 +497,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var pcData = TencentOCRTools.GetOCR((int)TencentOCREnum.PropOwnerCert, dto);
+            var pcData = await TencentOCRTools.GetOCR((int)TencentOCREnum.PropOwnerCert, dto);
 
             if (pcData.Code != 0)
             {
@@ -331,8 +513,8 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 结婚证识别
-        /// 获取结婚证返回数据 
+        /// 结婚证识别(腾讯OCR 未找到)
+        /// 返回数据 
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -346,7 +528,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var mlData = TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
+            var mlData = await TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
 
             if (mlData.Code != 0)
             {
@@ -362,8 +544,8 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 统一信用代码识别 
-        /// 获取统一信用代码返回数据 
+        /// 统一信用代码识别 (腾讯OCR 未找到)
+        /// 返回数据 
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -377,7 +559,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var gbData = TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
+            var gbData = await TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
 
             if (gbData.Code != 0)
             {
@@ -408,7 +590,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var pData = TencentOCRTools.GetOCR((int)TencentOCREnum.Passport, dto);
+            var pData = await TencentOCRTools.GetOCR((int)TencentOCREnum.Passport, dto);
 
             if (pData.Code != 0)
             {
@@ -420,7 +602,49 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(pData.Msg));
             }
 
-            return Ok(JsonView(pData.Data));
+            string url = "";
+            #region 文档下载
+
+            string fileName = "护照识别（中国大陆地区护照）";
+            string content = $"{fileName}\r\n\r\n";
+            PassportOCRResponse pInfo = pData.Data as PassportOCRResponse;
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+            if (pInfo != null)
+            {
+                content += $"国家码：{pInfo.Country ?? "Unknown"}\r\n\r\n";
+                content += $"护照号：{pInfo.PassportNo ?? "Unknown"}\r\n\r\n";
+                content += $"性别：{pInfo.Sex ?? "Unknown"}\r\n\r\n";
+                content += $"国籍：{pInfo.Nationality ?? "Unknown"}\r\n\r\n";
+                content += $"出生日期：{pInfo.BirthDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发日期：{pInfo.IssueDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发地点：{pInfo.IssuePlace ?? "Unknown"}\r\n\r\n";
+                content += $"有效期：{pInfo.ExpiryDate ?? "Unknown"}\r\n\r\n";
+                content += $"持证人签名：{pInfo.Signature ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第一行 MRZ Code 序列：{pInfo.CodeSet ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第二行 MRZ Code 序列：{pInfo.CodeCrc ?? "Unknown"}\r\n\r\n";
+                content += $"姓名：{pInfo.Name ?? "Unknown"}\r\n\r\n";
+                content += $"姓：{pInfo.FamilyName ?? "Unknown"}\r\n\r\n";
+                content += $"名：{pInfo.FirstName ?? "Unknown"}\r\n\r\n";
+            }
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+            //去水印
+            new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
+            doc.Save(outputPath);
+            url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+
+            #endregion
+
+            return Ok(JsonView(true,"操作成功", new { dataSource = pInfo, url = url }));
         }
 
         /// <summary>
@@ -439,7 +663,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var mlidpData = TencentOCRTools.GetOCR((int)TencentOCREnum.MLIDPassport, dto);
+            var mlidpData = await TencentOCRTools.GetOCR((int)TencentOCREnum.MLIDPassport, dto);
 
             if (mlidpData.Code != 0)
             {
@@ -451,7 +675,49 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(mlidpData.Msg));
             }
 
-            return Ok(JsonView(mlidpData.Data));
+            string url = "";
+            #region 文档下载
+
+            string fileName = "护照识别（中国大陆地区护照）";
+            string content = $"{fileName}\r\n\r\n";
+            PassportOCRResponse pInfo = mlidpData.Data as PassportOCRResponse;
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+            if (pInfo != null)
+            {
+                content += $"国家码：{pInfo.Country ?? "Unknown"}\r\n\r\n";
+                content += $"护照号：{pInfo.PassportNo ?? "Unknown"}\r\n\r\n";
+                content += $"性别：{pInfo.Sex ?? "Unknown"}\r\n\r\n";
+                content += $"国籍：{pInfo.Nationality ?? "Unknown"}\r\n\r\n";
+                content += $"出生日期：{pInfo.BirthDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发日期：{pInfo.IssueDate ?? "Unknown"}\r\n\r\n";
+                content += $"签发地点：{pInfo.IssuePlace ?? "Unknown"}\r\n\r\n";
+                content += $"有效期：{pInfo.ExpiryDate ?? "Unknown"}\r\n\r\n";
+                content += $"持证人签名：{pInfo.Signature ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第一行 MRZ Code 序列：{pInfo.CodeSet ?? "Unknown"}\r\n\r\n";
+                content += $"最下方第二行 MRZ Code 序列：{pInfo.CodeCrc ?? "Unknown"}\r\n\r\n";
+                content += $"姓名：{pInfo.Name ?? "Unknown"}\r\n\r\n";
+                content += $"姓：{pInfo.FamilyName ?? "Unknown"}\r\n\r\n";
+                content += $"名：{pInfo.FirstName ?? "Unknown"}\r\n\r\n";
+            }
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+            //去水印
+            new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String(AsposeHelper.asposeKey)));
+            doc.Save(outputPath);
+            url = $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+
+            #endregion
+
+            return Ok(JsonView(true, "操作成功", new { dataSource = pInfo, url = url }));
         }
 
         /// <summary>
@@ -472,7 +738,7 @@ namespace OASystem.API.Controllers
 
             try
             {
-                var mlidpData = TencentOCRTools.GetOCR((int)TencentOCREnum.BusinessCard, dto);
+                var mlidpData = await TencentOCRTools.GetOCR((int)TencentOCREnum.BusinessCard, dto);
                 if (mlidpData.Code != 0)
                 {
                     return Ok(JsonView(mlidpData.Msg));
@@ -491,6 +757,85 @@ namespace OASystem.API.Controllers
             }
         }
 
+        /// <summary>
+        /// 智能结构化识别V2
+        /// 获取名片 返回数据 
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetSmartStructuralOCRV2(BusinessCardOCRDto dto)
+        {
+            string[] picBase64Array = dto.picBase64.Split(';');
+            string picFormat = picBase64Array[0].Split('/')[1];
+            if (!TencentOCRTools.ImageType(picFormat))
+            {
+                return Ok(JsonView("图片格式不正确!只支持 PNG、JPG、JPEG、BMP 格式!"));
+            }
+
+            double strSize = 1024 * 1024 * 7;
+            if (dto.picBase64.Length > strSize)
+            {
+                return Ok(JsonView("图片不能大于7M!"));
+            }
+
+           
+            var ssData = await TencentOCRTools.GetOCR((int)TencentOCREnum.SmartStructuralOCRV2, dto);
+            if (ssData.Code != 0)
+            {
+                return Ok(JsonView(false, ssData.Msg));
+            }
+
+            if (ssData.Data == null)
+            {
+                return Ok(JsonView(false, ssData.Msg));
+            }
+
+            //var wordRes =  GenerateWord(ssData.Data as List<ocrGeneralView>, "智能结构化识别V2");
+            List<ocrGeneralView>? datas = ssData.Data as List<ocrGeneralView>;
+
+            var data = new { 
+                dataSource = ssData.Data,
+                url = GenerateWord(datas, "智能结构化识别V2")
+            };
+            return Ok(JsonView(true, ssData.Msg, data));
+           
+        }
+
+
+        /// <summary>
+        /// 生成 ocr word
+        /// </summary>
+        /// <param name="views"></param>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        private string GenerateWord(List<ocrGeneralView> views, string fileName)
+        {
+            Document doc = new Document();
+            DocumentBuilder builder = new DocumentBuilder(doc);
+
+            string content = $"{fileName}\r\n\r\n";
+            foreach (var view in views)
+            {
+                content += $"TypeName：{view.name}\t\r\nContent：{view.value}\r\n\r\n";
+            }
+
+            builder.Write(content);
+
+            string outputDir = $"{AppSettingsHelper.Get("WordBasePath")}/TencentOCR";
+            string outputFile = $"{fileName}{DateTime.Now.ToString("yyyyMMddHHmmss")}.docx";
+            string outputPath = Path.Combine(outputDir, outputFile);
+
+            if (!Directory.Exists(outputDir))
+            {
+                Directory.CreateDirectory(outputDir);
+            }
+
+            doc.Save(outputPath);
+
+            return $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/TencentOCR/{outputFile}";
+        }
         #endregion
 
         #region android ios

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -2687,5 +2687,7 @@ namespace OASystem.API.OAMethodLib
         }
         #endregion
 
+
+
     }
 }

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Config.cs

@@ -295,11 +295,42 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             return result;
         }
 
+
+        /// <summary>
+        /// 成本通知发送给用户
+        /// </summary>
+        /// <returns></returns>
+        public static string GroupShare_ToUser(GroupShare_ToUserModel info)
+        {
+            string result = string.Format(@" `成本通知`  
+
+<font color='info'>团组成本费用已更新</font>
+
+>团组名称：{0}
+>更新时间：<font color='warning'>{1}</font>
+
+><font color='comment'>请注意在费用录入页面中核对成本信息</font>
+
+><font color='comment'>若无对应团组权限请联系国交部经理或信息部人员</font>
+
+ ", info.TeamName, info.RefreshDate);
+
+
+
+            return result;
+        }
+
     }
 
 
     #region 实体类
 
+    public class GroupShare_ToUserModel
+    {
+        public string TeamName { get; set; }
+        public string RefreshDate { get; set; }
+    }
+
     public class DailyPayReminder_Pay_ToUserModel
     {
         public string PriceName { get; set; }

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Library.cs

@@ -106,7 +106,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.GroupStatus_Create(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.GroupStatus_Create(info));
 
                 if (result.errcode != 0)
                 {
@@ -500,7 +500,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.AuditResult_ApplyFee_User(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.AuditResult_ApplyFee_User(info));
 
                 if (ccp.IsAuditGM == 1)
                 {
@@ -595,7 +595,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.PayResult_Group_ToUser(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.PayResult_Group_ToUser(info));
 
                 if (result.errcode != 0)
                 {
@@ -641,7 +641,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
 
             Sys_Users user = _grpDeleRep.Query<Sys_Users>(s => s.Id == fin_DailyFeePayment.CreateUserId).First();
             Sys_JobPost job = _grpDeleRep.Query<Sys_JobPost>(s => s.Id == user.JobPostId).First();
-            string users = string.Format(@"{0}-{1}", job.JobName, user.CnName );
+            string users = string.Format(@"{0}-{1}", job.JobName, user.CnName);
 
             string[] companyArr = new string[] { "未知", "成都泛美商务有限公司", "四川泛美交流有限公司", "成都纽茵教育科技有限公司", "成都鸿企中元科技有限公司", "测试公司1" };
             string companyStr = "未知";
@@ -743,7 +743,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.DailyPayReminder_Audit_ToUser(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.DailyPayReminder_Audit_ToUser(info));
                 if (result.errcode != 0)
                 {
                     //抄送日志 
@@ -772,16 +772,54 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.DailyPayReminder_Pay_ToUser(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.DailyPayReminder_Pay_ToUser(info));
+                if (result.errcode != 0)
+                {
+                    //抄送日志 
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        #endregion
+
+        #region 成本通知
+
+        /// <summary>
+        /// 成本通知发送给对应岗位用户
+        /// </summary>
+        /// <param name="diId"></param>
+        /// <returns></returns>
+        public static async Task<bool> SendUserMsg_GroupShare_ToJob(int diId)
+        {
+            Grp_DelegationInfo groupInfo = _grpDeleRep.Query<Grp_DelegationInfo>(s => s.Id == diId).First();
+            List<Sys_Users> list_user = _grpDeleRep.Query<Sys_Users>(s => s.IsDel == 0 && (s.JobPostId == 24 || s.JobPostId == 25 || s.JobPostId == 28)).ToList();
+            //List<Sys_Users> list_user = _grpDeleRep.Query<Sys_Users>(s => s.IsDel == 0 && (s.JobPostId == 40 || s.JobPostId == 41)).ToList();
+            List<string> userIds = new List<string>();
+            list_user.ForEach(s => userIds.Add(s.Id.ToString()));
+            List<string> qwUserIdList = GetQiyeChatUserIdList(userIds);
+
+            GroupShare_ToUserModel info = new GroupShare_ToUserModel()
+            {
+                RefreshDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm"),
+                TeamName = groupInfo.TeamName
+            };
+
+            if (qwUserIdList.Count > 0)
+            {
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.GroupShare_ToUser(info));
                 if (result.errcode != 0)
                 {
                     //抄送日志 
                     return false;
                 }
             }
+
             return true;
         }
 
+
         #endregion
 
         #region Helper

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -1550,7 +1550,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
             };
 
 
-            string url = string.Format("/cgi-bin/message/send?access_token={0}", access_Token.access_token);
+            string url = string.Format("/cgi-bin/message/send?access_token={0}&debug=1", access_Token.access_token);
             var json = System.Text.Json.JsonSerializer.Serialize(reqJson);
             var content = new StringContent(json, Encoding.UTF8, "application/json");
             var create_Req = await _httpClient.PostAsync(url, content);

OASystem/OASystem.Api/OAMethodLib/TencentCloudAPI/TencentOCRTools.cs

@@ -3,6 +3,8 @@ using TencentCloud.Common;
 using TencentCloud.Ocr.V20181119.Models;
 using TencentCloud.Ocr.V20181119;
 using OASystem.Domain.ViewModels.OCR;
+using Aspose.Words;
+using NPOI.SS.Formula.Functions;
 
 namespace OASystem.API.OAMethodLib.TencentCloudAPI
 {
@@ -26,7 +28,7 @@ namespace OASystem.API.OAMethodLib.TencentCloudAPI
         /// <param name="ocrEnum">转换类型</param>
         /// <param name="data">请求数据源</param>
         /// <returns></returns>
-        public static Result GetOCR(int ocrEnum, object data)
+        public static async Task<Result> GetOCR(int ocrEnum, object data)
         {
             Result result = new Result { Code = -1, Msg = "未知错误", Data = null };
             OcrClient client = new OcrClient(cred, "ap-guangzhou");
@@ -117,6 +119,25 @@ namespace OASystem.API.OAMethodLib.TencentCloudAPI
                         BusinessCardOCRResponse bcRep = client.BusinessCardOCRSync(bcReq);
                         result.Data = bcRep;
                         break;
+                    case 10: // 智能结构化识别V2
+                        //SmartStructuralOCRV2
+                        BusinessCardOCRDto ssOCR = (BusinessCardOCRDto)data;
+                        SmartStructuralOCRRequest ssReq = new SmartStructuralOCRRequest()
+                        {
+                            ImageBase64 = ssOCR.picBase64,
+                            IsPdf = true,
+                            ReturnFullText = true
+                        };
+
+                        SmartStructuralOCRResponse ssRep = client.SmartStructuralOCRSync(ssReq);
+                         List<StructuralItem> structuralItems = ssRep.StructuralItems.ToList();
+                        if (structuralItems.Count() < 1 )
+                        {
+                            return new Result() { Code = -1, Msg = "智能结构化识别V2：未识别出可用信息" };
+                        }
+                        List<ocrGeneralView> _views = structuralItems.Select(it => new ocrGeneralView() { name = it.Name, value = it.Value }).ToList();
+                        result.Data = _views;
+                        break;
                 }
 
                 result.Code = 0;
@@ -298,5 +319,8 @@ namespace OASystem.API.OAMethodLib.TencentCloudAPI
                 return Math.Round(size / TBCount, roundCount) + "TB";
             }
         }
+
+        
+
     }
 }

OASystem/OASystem.Api/OASystem.API.csproj

@@ -22,6 +22,7 @@
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.23" />
     <PackageReference Include="Aspose.Cells" Version="23.4.0" />
+    <PackageReference Include="Aspose.Words" Version="21.8.0" />
     <PackageReference Include="Autofac" Version="6.4.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="AutoMapper" Version="12.0.0" />

OASystem/OASystem.Domain/Enums/TencentOCREnum.cs

@@ -61,6 +61,10 @@ namespace OASystem.Domain.Enums
         /// <summary>
         /// 名片识别
         /// </summary>
-        BusinessCard
+        BusinessCard,
+        /// <summary>
+        /// 智能结构化识别V2
+        /// </summary>
+        SmartStructuralOCRV2
     }
 }

OASystem/OASystem.Domain/ViewModels/OCR/OCRAppView.cs

@@ -48,4 +48,22 @@ namespace OASystem.Domain.ViewModels.OCR
 
     }
 
+    /// <summary>
+    /// ocr 通用视图
+    /// </summary>
+    public class ocrGeneralView
+    {
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 类型值
+        /// </summary>
+        public string value { get; set; }
+
+
+    }
+
 }