From a3fffa17c643bb96159a23880e1749c486279906 Mon Sep 17 00:00:00 2001
From: leomon <2233021400@qq.com>
Date: Thu, 05 Jun 2025 00:32:29 +0800
Subject: [PATCH] 消息中心统一 响应R
---
oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java
index e34c508..4ce11f6 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MessageSystemController.java
@@ -59,9 +59,10 @@
@GetMapping
@ApiOperation("查询消息_系统")
@PreAuthorize("@el.check('messageSystem:list')")
- public ResponseEntity<PageResult<MessageSystem>> queryMessageSystem(MessageSystemQueryCriteria criteria){
+ public R<PageResult<MessageSystem>> queryMessageSystem(MessageSystemQueryCriteria criteria){
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(messageSystemService.queryAll(criteria,page),HttpStatus.OK);
+// return new ResponseEntity<>(messageSystemService.queryAll(criteria,page),HttpStatus.OK);
+ return R.success(messageSystemService.queryAll(criteria,page));
}
// @PostMapping
@@ -94,14 +95,15 @@
//查询一条系统消息
@GetMapping("/{id}")
@ApiOperation("查询一条系统消息")
- public ResponseEntity<MessageSystem> getMessageSystem(@PathVariable Integer id){
+ public R<MessageSystem> getMessageSystem(@PathVariable Integer id){
MessageSystem messageSystem = messageSystemService.getById(id);
- return new ResponseEntity<>(messageSystem,HttpStatus.OK);
+// return new ResponseEntity<>(messageSystem,HttpStatus.OK);
+ return R.success(messageSystem);
}
//插入一条系统消息 带两个参数start与end
@PostMapping()
@ApiOperation("插入一条系统消息")
- public ResponseEntity<Object> insertMessageSystem(
+ public R<Object> insertMessageSystem(
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date start,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
@@ -113,7 +115,8 @@
// 调用服务层保存数据
messageSystemService.save(messageSystem);
- return new ResponseEntity<>(HttpStatus.OK);
+// return new ResponseEntity<>(HttpStatus.OK);
+ return R.success("插入成功");
}
/**
@@ -162,15 +165,21 @@
// }
// }
// }
-
+//todo 发送订阅消息 数据库暂未存储
@PostMapping("/sendMessage")
@ApiOperation("发送订阅消息")
public R<SendMessageRequestDto> sendMessage(@RequestBody SendMessageRequestDto request){
//打印request
//SendMessageRequestDto(touser=OPENID, template_id=TEMPLATE_ID, page=index, data={date2={"value":"2019-12-25 09:42"}, phrase3={"value":"审核通过"}, name1={"value":"订阅"}})
log.info("request:{}", request);
- weiXinService.sendMessage(request.getData(), request.getTouser(), request.getTemplate_id(), request.getPage());
- return R.success(request);
+ try {
+ weiXinService.sendMessage(request.getData(), request.getTouser(), request.getTemplate_id(), request.getPage());
+ return R.success(request);
+ } catch (Exception e) {
+ // 如果捕获到异常，返回错误信息
+ log.error("发送订阅消息失败", e);
+ return R.fail(request,"发送订阅消息失败 用真实数据：" + e.getMessage());
+ }
}
--
Gitblit v1.9.3