diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml index 463d70acd..f07715c83 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml @@ -72,6 +72,12 @@ rocketmq-spring-boot-starter 2.0.3 + + com.esua.epdc.shibei + epdc-message-client + 1.0.0 + compile + diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/async/RejectCheckResultsTask.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/async/RejectCheckResultsTask.java new file mode 100644 index 000000000..b0f3994bb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/async/RejectCheckResultsTask.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.async; + +import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; +import com.elink.esua.epdc.feign.MessageFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +/** + * + * 内容审核-违规 - 发送短信 + * + * @Author：wangtong + * @Date：2020/7/16 10:31 + */ +@Component +public class RejectCheckResultsTask { + + @Autowired + private MessageFeignClient messageFeignClient; + + /** + * @describe: 短信通知 + * @author wangtong + * @date 2020/7/16 9:49 + * @params [smsNoticeFormDTO] + * @return void + */ + @Async + public void sendSmsNotice(SmsNoticeFormDTO smsNoticeFormDTO) { + messageFeignClient.sendSmsNotice(smsNoticeFormDTO); + } + + +} diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/feign/MessageFeignClient.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/feign/MessageFeignClient.java new file mode 100644 index 000000000..de5657973 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/feign/MessageFeignClient.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; +import com.elink.esua.epdc.feign.fallback.MessageFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 消息通知模块 + * + * @Author：wangtong + * @Date：2020/7/16 10:31 + */ +@FeignClient(name = ServiceConstant.EPDC_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class) +public interface MessageFeignClient { + + /** + * 议题：待回应事件 审核结果短信通知 议题发起人 + * + * @param smsNoticeFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zy + * @Date：2020/01/08 10:31 + */ + @PostMapping(value = "message/epdc-app/smstemplate/sendSmsNotice", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result sendSmsNotice(@RequestBody SmsNoticeFormDTO smsNoticeFormDTO); +} diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/feign/fallback/MessageFeignClientFallback.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/feign/fallback/MessageFeignClientFallback.java new file mode 100644 index 000000000..47880c642 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/feign/fallback/MessageFeignClientFallback.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; +import com.elink.esua.epdc.feign.MessageFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：wangtong + * @Date：2020/7/16 10:31 + */ +@Component +public class MessageFeignClientFallback implements MessageFeignClient { + + @Override + public Result sendSmsNotice(SmsNoticeFormDTO smsNoticeFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_MESSAGE_SERVER, "sendSmsNotice", smsNoticeFormDTO); + } +} diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java index 4f499c72e..0c5290bfd 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.async.RejectCheckResultsTask; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; @@ -29,9 +30,11 @@ import com.elink.esua.epdc.commons.tools.security.content.ModuleName; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.constant.SysSmsTemplateConstant; import com.elink.esua.epdc.dao.*; import com.elink.esua.epdc.dto.CheckResultDTO; import com.elink.esua.epdc.dto.form.HandleRecordsFormDTO; +import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.entity.*; import com.elink.esua.epdc.redis.CheckResultRedis; import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO; @@ -75,6 +78,9 @@ public class CheckResultServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -163,6 +169,9 @@ public class CheckResultServiceImpl extends BaseServiceImpl().ok("处理成功"); } + /** + * @describe: 人工审核内审违规后，向用户发送短信提示 + * @author wangtong + * @date 2020/7/16 9:42 + * @params [userMobile] + * @return void + */ + private void checkSmsNotification(String userMobile){ + List list = new ArrayList<>(); + list.add(userMobile); + // 驳回用户提交信息 操作发送短信 + SmsNoticeFormDTO sms = new SmsNoticeFormDTO(); + sms.setMobiles(list); + sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_CONTENT_SECURITY_BLOCK); + rejectCheckResultsTask.sendSmsNotice(sms); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/constant/SysSmsTemplateConstant.java b/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/constant/SysSmsTemplateConstant.java index 4af79e839..d3bb52963 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/constant/SysSmsTemplateConstant.java +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-client/src/main/java/com/elink/esua/epdc/constant/SysSmsTemplateConstant.java @@ -61,4 +61,10 @@ public interface SysSmsTemplateConstant { * 工作端-项目-结案 */ String SMS_TEMPLATE_WORK_ITEM_SETTLE = "WORK_ITEM_SETTLE"; + /** + * 内容审核-违规 + */ + String SMS_TEMPLATE_CONTENT_SECURITY_BLOCK = "CONTENT_SECURITY_BLOCK"; + + }