fix:添加通道配置VoBo，添加获取通道配置分页接口

data/init/sys_menu.json

@@ -2828,7 +2828,7 @@
       "icon": "",
       "isCache": "0",
       "isFrame": "1",
-      "menuName": "通道模板",
+      "menuName": "模板配置",
       "menuType": "C",
       "orderNum": 2,
       "parentId": 1664638344103575553,

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

@@ -1,6 +1,10 @@
 package cc.iotkit.manager.controller;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.api.Request;
+import cc.iotkit.manager.dto.bo.channel.ChannelConfigBo;
+import cc.iotkit.manager.dto.vo.channel.ChannelConfigVo;
 import cc.iotkit.manager.service.NotifyService;
 import cc.iotkit.model.notify.Channel;
 import cc.iotkit.model.notify.ChannelConfig;
@@ -15,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-
 import java.util.List;
 
 /**
@@ -40,8 +43,8 @@ public class NotifyController {
 
     @ApiOperation("获取通道配置列表")
     @PostMapping("/channel/config/getList")
-    public List<ChannelConfig> getChannelConfigList() {
-        return notifyService.getChannelConfigList();
+    public Paging<ChannelConfigVo> getChannelConfigList(PageRequest<ChannelConfigBo> request) {
+        return notifyService.getChannelConfigList(request);
     }
 
     @ApiOperation("新增通道配置")

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java

@@ -0,0 +1,35 @@
+package cc.iotkit.manager.dto.bo.channel;
+
+import cc.iotkit.common.api.BaseDto;
+import cc.iotkit.model.notify.ChannelConfig;
+import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@ApiModel(value = "ChannelConfigBo")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChannelConfig.class, reverseConvertGenerate = false)
+public class ChannelConfigBo extends BaseDto  {
+
+	private static final long serialVersionUID = -1L;
+
+	@ApiModelProperty(value="id")
+	private String id;
+
+	@ApiModelProperty(value="通道id")
+	private String channelId;
+
+	@ApiModelProperty(value="通道配置名称")
+	private String title;
+
+	@ApiModelProperty(value="通道配置参数")
+	private String param;
+
+	@ApiModelProperty(value="创建时间")
+	private Long createAt;
+
+    }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java

@@ -1,25 +1,11 @@
 package cc.iotkit.manager.dto.bo.product;
 
+import cc.iotkit.common.api.BaseDto;
 import cc.iotkit.model.product.Product;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import io.github.linpeilie.annotations.AutoMapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import jakarta.validation.constraints.Size;
-
-
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import cc.iotkit.common.api.BaseDto;
-import cc.iotkit.common.validate.AddGroup;
-import cc.iotkit.common.validate.EditGroup;
-
-import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java

@@ -0,0 +1,40 @@
+package cc.iotkit.manager.dto.vo.channel;
+
+import cc.iotkit.model.notify.ChannelConfig;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "ChannelConfigVo")
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChannelConfig.class)
+public class ChannelConfigVo implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    @ApiModelProperty(value="通道配置id")
+    @ExcelProperty(value = "通道配置id")
+    private String id;
+
+    @ApiModelProperty(value="通道id")
+    @ExcelProperty(value = "通道id")
+    private String channelId;
+
+    @ApiModelProperty(value="通道配置名称")
+    @ExcelProperty(value = "通道配置名称")
+    private String title;
+
+    @ApiModelProperty(value="通道配置参数")
+    @ExcelProperty(value = "通道配置参数")
+    private String param;
+
+    @ApiModelProperty(value="创建时间")
+    @ExcelProperty(value = "创建时间")
+    private Long createAt;
+}

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/product/ProductVo.java

@@ -1,17 +1,14 @@
 package cc.iotkit.manager.dto.vo.product;
 
 import cc.iotkit.model.product.Product;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.ToString;
-import java.util.Date;
+
 import java.io.Serializable;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
 
 
 @ApiModel(value = "ProductVo")

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

@@ -1,8 +1,12 @@
 package cc.iotkit.manager.service;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.data.manager.IChannelConfigData;
 import cc.iotkit.data.manager.IChannelData;
 import cc.iotkit.data.manager.IChannelTemplateData;
+import cc.iotkit.manager.dto.bo.channel.ChannelConfigBo;
+import cc.iotkit.manager.dto.vo.channel.ChannelConfigVo;
 import cc.iotkit.model.notify.Channel;
 import cc.iotkit.model.notify.ChannelConfig;
 import cc.iotkit.model.notify.ChannelTemplate;
@@ -34,8 +38,8 @@ public class NotifyService {
         return iChannelData.findAll();
     }
 
-    public List<ChannelConfig> getChannelConfigList() {
-        return iChannelConfigData.findAll();
+    public Paging<ChannelConfigVo> getChannelConfigList(PageRequest<ChannelConfigBo> request) {
+        return iChannelConfigData.findAll(request.to(ChannelConfig.class)).to(ChannelConfigVo.class);
     }
 
     public ChannelConfig addChannelConfig(ChannelConfig channelConfig) {