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 * @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 userIdList =new ArrayList<>(); + userIdList.add(replyFormDTO.getUserId()); + Result> 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());