Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -134,6 +134,18 @@ namespace Hotline.Application.Mappers
                .Map(d => d.Status, x => x.Knowledge.Status)
                .Map(d => d.WorkFlowApplyStatus, x => x.WorkFlowApplyStatus);
 
+            config.NewConfig<Hotline.KnowledgeBase.Knowledge, KnowledgeSendDto>()
+                .Map(d => d.CategoryCode, x => x.HotspotType.ProvinceCode)
+                   .Map(d => d.CategoryName, x => x.HotspotType.HotSpotName)
+                      .Map(d => d.PublishPerson, x => x.User.Name)
+                         .Map(d => d.OuName, x => x.SystemOrganize.OrgName)
+                           .Map(d => d.KName, x => x.Title)
+                             .Map(d => d.KContent, x => x.Content)
+                              .Map(d => d.CreatDate, x => x.OnShelfTime)
+                               .Map(d => d.BeginDate, x => x.OnShelfTime)
+                                 .Map(d => d.DisableDate, x => x.ExpiredTime)
+                                   .Map(d => d.UID, x => x.Code)
+                ;
             #endregion
 
             #region order

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -349,33 +349,17 @@ namespace Hotline.KnowledgeBase
                     break;
             }
 
-            #region 省数据推送
-            //组装省推送数据
-            KnowledgeSendDto knowledgeSendDto = new()
-            {
-                CategoryCode = knowledge.HotspotType.ProvinceCode,
-                CategoryName = knowledge.HotspotType.HotSpotName,
-                PublishPerson = knowledge.User.Name,
-                OuName = knowledge.SystemOrganize.OrgName,
-                KName = knowledge.Title,
-                KContent = knowledge.Content,
-                CreatDate = knowledge.OnShelfTime,
-                BeginDate = knowledge.OnShelfTime,
-                DisableDate = knowledge.ExpiredTime,
-                UID = knowledge.Code,
-                AreaCode = "",
-            };
-
+            #region 数据推送
             //推送
             if (isSendType == "0")  //新增知识推送
 
-                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoSend, knowledgeSendDto, cancellationToken: cancellationToken);
+                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoSend, _mapper.Map<KnowledgeSendDto>(knowledge), cancellationToken: cancellationToken);
             else if (isSendType == "1")  //修改知识推送
 
-                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoUpdate, knowledgeSendDto, cancellationToken: cancellationToken);
+                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoUpdate, _mapper.Map<KnowledgeSendDto>(knowledge), cancellationToken: cancellationToken);
             else if (isSendType == "2")   //删除知识推送
 
-                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoAbandon, knowledgeSendDto, cancellationToken: cancellationToken);
+                await _capPublisher.PublishAsync(EventNames.HotlineKnowledgeInfoAbandon, _mapper.Map<KnowledgeSendDto>(knowledge), cancellationToken: cancellationToken);
             #endregion
         }
     }