消息微服调用优化

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java

@@ -56,7 +56,7 @@ public class SysMessageController extends CoreBaseController {
 
     @PostMapping(value = "/sys-message/insert")
     @ApiOperation(value = "新增消息",notes = "新增消息")
-    public ResultBean insertSysMessage(@RequestBody SysMessage sysMessage){
+    public ResultBean<SysMessage> insertSysMessage(@RequestBody SysMessage sysMessage){
         try {
             // 条件校验
             ValidatorBean.beginValid(sysMessage)
@@ -147,7 +147,7 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/sys-message/get/{id}")
     @ApiOperation(value = "根据id查询消息",notes = "根据id查询消息")
-    public ResultBean getSysMessageById(@PathVariable("id") String idStr){
+    public ResultBean<SysMessage> getSysMessageById(@PathVariable("id") String idStr){
         try {
             SysMessage sysMessage = sysMessageService.getSysMessageById(Long.parseLong(idStr));
             if (sysMessage != null) {
@@ -164,7 +164,7 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/sys-message/query")
     @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序")
-    public ResultBean querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){
+    public ResultBean<SysMessage> querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){
         try {
             ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(messagePagerModel.getSysMessage(),
                     messagePagerModel.getPager());
@@ -200,7 +200,7 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/user-message/query-inbox")
     @ApiOperation(value = "查询用户收件箱，分页，排序")
-    public ResultBean queryInboxByPager(SysRefUserMessage sysRefUserMessage,Pager pager){
+    public ResultBean<SysMessage> queryInboxByPager(SysRefUserMessage sysRefUserMessage,Pager pager){
         try {
             // 设置消息类型为站内信
             sysRefUserMessage.setMessageTypeRdd(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue());
@@ -217,7 +217,7 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/user-message/query-outbox")
     @ApiOperation(value = "查询用户发件箱，分页，排序")
-    public ResultBean queryOutboxByPager(SysMessage sysMessage,Pager pager){
+    public ResultBean<SysMessage> queryOutboxByPager(SysMessage sysMessage,Pager pager){
         try {
             // 发件人为当前用户
             sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue());
@@ -234,10 +234,10 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/user-message/find-unread")
     @ApiOperation(value = "查看用户未读站内信")
-    public ResultBean findUnreadUserMessage(){
+    public ResultBean<SysRefUserMessage> findUnreadUserMessage(){
         try {
-            List userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(getSessionUser().getUser().getId(),
-                        ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
+            List<SysRefUserMessage> userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(
+                    getSessionUser().getUser().getId(), ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
             return  ResultBean.success("操作成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -248,7 +248,7 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/user-message/get/{id}")
     @ApiOperation(value = "根据id查询消息",notes = "根据id查询消息")
-    public ResultBean getUserMessageById(@PathVariable("id") String idStr){
+    public ResultBean<SysMessage> getUserMessageById(@PathVariable("id") String idStr){
         try {
             ValidatorBean.checkNotNull(idStr,"id");
 
@@ -344,7 +344,7 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/user-message/query")
     @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序")
-    public ResultBean querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){
+    public ResultBean<SysRefUserMessage> querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){
         try {
             ListPager sysMessageListPager = sysMessageService.querySysRefUserMessageByPager(
                     refUserMessagePagerModel.getSysRefUserMessage(),refUserMessagePagerModel.getPager());