diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java index a288925..79c80d6 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeign.java @@ -6,10 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -135,4 +132,8 @@ public interface MessageFeign { @ApiOperation("移交推送消息") @PostMapping("/pushTransferMessage") ResultBean pushTransferMessage(@RequestBody MessagePushTransferDto dto); + + @ApiOperation("消息推送测试") + @PostMapping("/pushTest") + ResultBean pushTest(@RequestParam("userSid") String userSid); } \ No newline at end of file diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java index a88f52d..c158026 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/message/MessageFeignFallback.java @@ -110,4 +110,9 @@ public class MessageFeignFallback implements MessageFeign { public ResultBean pushTransferMessage(MessagePushTransferDto dto) { return null; } + + @Override + public ResultBean pushTest(String userSid) { + return null; + } } \ No newline at end of file diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java index 52b5703..3ef31f7 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageRest.java @@ -191,4 +191,9 @@ public class MessageRest implements MessageFeign { } return rb.success(); } + + @Override + public ResultBean pushTest(String userSid) { + return messageService.pushTest(userSid); + } } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java index 108ee65..3c3e558 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java @@ -1150,4 +1150,22 @@ public class MessageService extends MybatisBaseService { } return rb.success(); } + + public ResultBean pushTest(String userSid) { + ResultBean rb = ResultBean.fireFail(); + List receivedSids = new ArrayList<>(); + receivedSids.add(userSid); + ResultBean stringList = sysUserFeign.selectIdBySid(receivedSids); + List receiveIdList = Arrays.asList(stringList.getData().split(",")); + //标题、内容、消息类别key、消息类别名称、 + YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean(); + factoryBean.setResources(new ClassPathResource("application.yml")); + Properties properties = factoryBean.getObject(); + if ("pro".equals(properties.get("spring.profiles.active"))) { + JPushServer.sendPushAlias("测试消息推送", "业务内容", "b4b50229-cce0-4cb1-8c0a-ae7545a9ec59", "审批中心", receiveIdList.get(0)); + } else { + JPushServer.sendPushAlias("测试消息推送", "业务内容", "b4b50229-cce0-4cb1-8c0a-ae7545a9ec59", "审批中心", "T" + receiveIdList.get(0)); + } + return rb.success(); + } } \ No newline at end of file