From 83b4c555550c1e1cac8e10b5fb7c15b0f2822a61 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 15:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E5=BD=93=E4=BA=8B=E4=BA=BA?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 3 +- .../controller/ResiEventReplyController.java | 17 +++++ .../epmet/service/ResiEventReplyService.java | 10 +++ .../impl/ResiEventReplyServiceImpl.java | 74 +++++++++++++++++-- 4 files changed, 98 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index ead3a480f5..1a29d62e54 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -97,7 +97,8 @@ public enum EpmetErrorCode { VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"), RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"), RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"), - CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"), + CAN_NOT_REPLY_RESI_EVENT_GOV(8605,"办结、立项处理后不可回复"), + CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), 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 f7c57b14c5..2d8063a97c 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 @@ -76,4 +76,21 @@ public class ResiEventReplyController { resiEventReplyService.govReply(replyFormDTO); return new Result(); } + + /** + * 报事当事人回复 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/4 14:37 + */ + @PostMapping("selfReply") + public Result selfReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); + resiEventReplyService.selfReply(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 4311de0805..a63654bde1 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 @@ -50,4 +50,14 @@ public interface ResiEventReplyService extends BaseService * @date 2021/8/4 14:20 */ void govReply(ReplyFormDTO replyFormDTO); + + /** + * 报事当事人回复 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/4 14:39 + */ + void selfReply(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 2bfa788811..986c8328bb 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 @@ -34,9 +34,11 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; +import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.entity.ResiEventOperationLogEntity; import com.epmet.entity.ResiEventReplyEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventReplyService; import org.apache.commons.lang3.StringUtils; @@ -44,7 +46,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -63,6 +67,9 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl userIdList =new ArrayList<>(); + userIdList.add(formDTO.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(formDTO.getResiEventId()); + resiEventReplyEntity.setFromUserId(formDTO.getUserId()); + resiEventReplyEntity.setContent(formDTO.getContent()); + resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getShowName()); + 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.RESI_USER); + reCallLog.setActionCode(ResiEventAction.REPLY.getCode()); + reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc()); + reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime()); + resiEventOperationLogDao.insert(reCallLog); + } + private void scanReplyContent(String content) { if (StringUtils.isNotBlank(content)) { TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); @@ -147,4 +207,8 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl