From 074fdaca211405c14db5645fe261be4d5869fe03 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 15:11:31 +0800
Subject: [PATCH] =?UTF-8?q?@=E7=9A=84=E4=BA=BA=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResiEventReplyController.java  | 17 ++++++++
 .../epmet/service/ResiEventReplyService.java  | 10 +++++
 .../impl/ResiEventReplyServiceImpl.java       | 43 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
index 2d8063a97c..0d7f93a2d8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -93,4 +93,21 @@ public class ResiEventReplyController {
         resiEventReplyService.selfReply(formDTO);
         return new Result();
     }
+
+    /**
+     * 艾特的人回复
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/4 15:06
+     */
+    @PostMapping("atReply")
+    public Result atReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class);
+        resiEventReplyService.atReply(formDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
index a63654bde1..4ad83c6e04 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
@@ -60,4 +60,14 @@ public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity>
      * @date 2021/8/4 14:39
      */
     void selfReply(ReplyFormDTO formDTO);
+
+    /**
+     * 艾特的人回复
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/4 15:06
+     */
+    void atReply(ReplyFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 986c8328bb..547d17e230 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -121,7 +121,6 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
         // 记录操作日志
-        //2、插入log日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
         reCallLog.setCustomerId(eventEntity.getCustomerId());
         reCallLog.setResiEventId(eventEntity.getId());
@@ -178,11 +177,51 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
         // 记录操作日志
-        //2、插入log日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
         reCallLog.setCustomerId(eventEntity.getCustomerId());
         reCallLog.setResiEventId(eventEntity.getId());
         reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.REPORT_USER);
+        reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
+        reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
+        reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
+    }
+
+    /**
+     * 艾特的人回复
+     *
+     * @param replyFormDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/4 15:06
+     */
+    @Override
+    public void atReply(ReplyFormDTO replyFormDTO) {
+        ResiEventEntity eventEntity=queryResiEntity(replyFormDTO.getResiEventId());
+        // 回复内容走审核
+        scanReplyContent(replyFormDTO.getContent());
+        // 查询当前用户的显示昵称
+        List<String> userIdList =new ArrayList<>();
+        userIdList.add(replyFormDTO.getUserId());
+        Result<List<UserBaseInfoResultDTO>> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+        if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){
+            throw new RenException("查询当前用户信息异常");
+        }
+        // 插入回复表
+        ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity();
+        resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId());
+        resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId());
+        resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId());
+        resiEventReplyEntity.setContent(replyFormDTO.getContent());
+        resiEventReplyEntity.setUserShowName("人大代表-".concat(userResult.getData().get(0).getRealName()));
+        resiEventReplyEntity.setCreatedTime(new Date());
+        baseDao.insert(resiEventReplyEntity);
+        // 记录操作日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(eventEntity.getCustomerId());
+        reCallLog.setResiEventId(eventEntity.getId());
+        reCallLog.setUserId(replyFormDTO.getUserId());
         reCallLog.setUserIdentity(EventConstant.RESI_USER);
         reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());