瀏覽代碼

fix:消息列表联调完成

tangfudong 2 年之前
父節點
當前提交
c6f1e356b2

+ 7 - 0
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/NotifyController.java

@@ -13,6 +13,7 @@ import cc.iotkit.manager.service.NotifyService;
 import cc.iotkit.model.notify.Channel;
 import cc.iotkit.model.notify.ChannelConfig;
 import cc.iotkit.model.notify.ChannelTemplate;
+import cc.iotkit.model.notify.NotifyMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -111,4 +112,10 @@ public class NotifyController {
         return notifyService.delChannelTemplateById(request.getData());
     }
 
+    @ApiOperation("消息列表")
+    @PostMapping("/message/getList")
+    public Paging<NotifyMessage> messageList(@RequestBody @Validated(QueryGroup.class) PageRequest<NotifyMessage> request) {
+        return notifyService.getNotifyMessageList(request);
+    }
+
 }

+ 9 - 0
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/NotifyService.java

@@ -6,6 +6,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelConfigData;
 import cc.iotkit.data.manager.IChannelData;
 import cc.iotkit.data.manager.IChannelTemplateData;
+import cc.iotkit.data.manager.INotifyMessageData;
 import cc.iotkit.manager.dto.bo.channel.ChannelConfigBo;
 import cc.iotkit.manager.dto.bo.channel.ChannelTemplateBo;
 import cc.iotkit.manager.dto.vo.channel.ChannelConfigVo;
@@ -13,6 +14,7 @@ import cc.iotkit.manager.dto.vo.channel.ChannelTemplateVo;
 import cc.iotkit.model.notify.Channel;
 import cc.iotkit.model.notify.ChannelConfig;
 import cc.iotkit.model.notify.ChannelTemplate;
+import cc.iotkit.model.notify.NotifyMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +39,9 @@ public class NotifyService {
     @Resource
     private IChannelTemplateData iChannelTemplateData;
 
+    @Resource
+    private INotifyMessageData iNotifyMessageData;
+
     public List<Channel> getChannelList() {
         return iChannelData.findAll();
     }
@@ -86,4 +91,8 @@ public class NotifyService {
         iChannelTemplateData.deleteById(id);
         return Boolean.TRUE;
     }
+
+    public Paging<NotifyMessage> getNotifyMessageList(PageRequest<NotifyMessage> request) {
+        return iNotifyMessageData.findAll(request);
+    }
 }