From 77997bd26555ad55170af406c4794fbf2799a5e5 Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期一, 26 八月 2024 17:04:14 +0800 Subject: [PATCH] opcda opcua 新增vo --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDeviceRespVO.java | 55 +++++++++ iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagRespVO.java | 51 ++++++++ iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDevicePageReqVO.java | 21 +++ iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDeviceRespVO.java | 63 ++++++++++ iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagPageReqVO.java | 23 +++ iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagRespVO.java | 55 +++++++++ iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDevicePageReqVO.java | 21 +++ pom.xml | 2 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagPageReqVO.java | 23 +++ 9 files changed, 313 insertions(+), 1 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDevicePageReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDevicePageReqVO.java new file mode 100644 index 0000000..7619bdb --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDevicePageReqVO.java @@ -0,0 +1,21 @@ +package com.iailab.module.data.channel.opcda.vo; + +import com.iailab.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcda分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OpcDaDevicePageReqVO extends PageParam { + + private String serverName; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDeviceRespVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDeviceRespVO.java new file mode 100644 index 0000000..fe7bc86 --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaDeviceRespVO.java @@ -0,0 +1,55 @@ +package com.iailab.module.data.channel.opcda.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcdaDevice Response VO") +@Data +@ExcelIgnoreUnannotated +public class OpcDaDeviceRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("ID") + private String id; + + @Schema(description = "服务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("服务名") + private String serverName; + + @Schema(description = "IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("IP") + private String host; + + @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("用户名") + private String user; + + @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("密码") + private String password; + + @Schema(description = "设备名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("设备名") + private String progId; + + @Schema(description = "设备注册表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("设备注册表ID") + private String clsId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("创建时间") + private Date createTime; + + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagPageReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagPageReqVO.java new file mode 100644 index 0000000..0a03a6c --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagPageReqVO.java @@ -0,0 +1,23 @@ +package com.iailab.module.data.channel.opcda.vo; + +import com.iailab.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcda分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OpcDaTagPageReqVO extends PageParam { + + private String tagName; + + private String serverId; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagRespVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagRespVO.java new file mode 100644 index 0000000..89709db --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcda/vo/OpcDaTagRespVO.java @@ -0,0 +1,51 @@ +package com.iailab.module.data.channel.opcda.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcdaTag Response VO") +@Data +@ExcelIgnoreUnannotated +public class OpcDaTagRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("ID") + private String id; + + @Schema(description = "服务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("服务ID") + private String serverId; + + @Schema(description = "tag名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("tag名称") + private String tagName; + + @Schema(description = "数据类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("数据类型") + private String dataType; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("是否启用") + private Boolean enabled; + + @Schema(description = "itemID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("itemID") + private String itemId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("创建时间") + private Date createTime; + + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDevicePageReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDevicePageReqVO.java new file mode 100644 index 0000000..e40a0d5 --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDevicePageReqVO.java @@ -0,0 +1,21 @@ +package com.iailab.module.data.channel.opcua.vo; + +import com.iailab.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcua分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OpcUaDevicePageReqVO extends PageParam { + + private String serverName; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDeviceRespVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDeviceRespVO.java new file mode 100644 index 0000000..3a578ec --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaDeviceRespVO.java @@ -0,0 +1,63 @@ +package com.iailab.module.data.channel.opcua.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcuaDevice Response VO") +@Data +@ExcelIgnoreUnannotated +public class OpcUaDeviceRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("ID") + private String id; + + @Schema(description = "服务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("服务名") + private String serverName; + + @Schema(description = "端点URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("端点URL") + private String endpointUrl; + + @Schema(description = "安全策略", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("安全策略") + private String securityPolicy; + + @Schema(description = "安全模式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("安全模式") + private String securityMode; + + @Schema(description = "连接方式(0,匿名;1,用户名密码; 2,安全证书)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("连接方式") + private String connectionType; + + @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("用户名") + private String userName; + + @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("密码") + private String password; + + @Schema(description = "安全证书路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("安全证书路径") + private String certificatePath; + + @Schema(description = "设备不活动超时时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("设备不活动超时时间") + private Integer connectInactivityTimeout; + + @Schema(description = "重连超时", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("重连超时") + private Integer reconnectInterval; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagPageReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagPageReqVO.java new file mode 100644 index 0000000..4641af1 --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagPageReqVO.java @@ -0,0 +1,23 @@ +package com.iailab.module.data.channel.opcua.vo; + +import com.iailab.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcua分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class OpcUaTagPageReqVO extends PageParam { + + private String tagName; + + private String device; +} \ No newline at end of file diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagRespVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagRespVO.java new file mode 100644 index 0000000..2da2f1b --- /dev/null +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/opcua/vo/OpcUaTagRespVO.java @@ -0,0 +1,55 @@ +package com.iailab.module.data.channel.opcua.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * @author lirm + * @Description + * @createTime 2024年08月26日 + */ +@Schema(description = "数据平台 - opcuaTag Response VO") +@Data +@ExcelIgnoreUnannotated +public class OpcUaTagRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("ID") + private String id; + + @Schema(description = "tag名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("tag名称") + private String tagName; + + @Schema(description = "数据类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("数据类型") + private String dataType; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("是否启用") + private Boolean enabled; + + @Schema(description = "关联设备", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("关联设备") + private String device; + + @Schema(description = "Modbus地址 00001 ~49999", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("Modbus地址") + private String address; + + @Schema(description = "采集频率", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("采集频率") + private Integer samplingRate; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("创建时间") + private Date createTime; + + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index b6b1bfb..04a4ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ <nacos.username>nacos</nacos.username> <nacos.password>nacos</nacos.password> <nacos.metadata.version>1.0.0</nacos.metadata.version> - <log.path>E:\DLUT\iailab-plat</log.path> + <log.path>D:\DLUT\iailab-plat</log.path> <logstash.address>127.0.0.1:4560</logstash.address> </properties> <activation> -- Gitblit v1.9.3