From d69d806da8922ea9072fb5e69b751aaa226d244d Mon Sep 17 00:00:00 2001 From: lyf66 Date: Thu, 25 Jan 2024 17:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E6=96=87=E3=80=81?= =?UTF-8?q?=E9=9B=A8=E9=87=8F=E3=80=81=E6=B0=B4=E4=BD=8D=E3=80=81=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E3=80=81=E5=9B=BE=E5=83=8F=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BzProtocolInfoController.java | 2 +- .../gunshi/project/xyt/enums/RcvDataType.java | 37 +++++++++++++++++++ .../gunshi/project/xyt/model/RcvLogDownR.java | 24 ++++++++++++ .../gunshi/project/xyt/model/RcvLogUpR.java | 28 ++++++++++++++ .../com/gunshi/project/xyt/model/StFlowR.java | 11 ++++++ .../com/gunshi/project/xyt/model/StImgR.java | 11 ++++++ .../com/gunshi/project/xyt/model/StPptnR.java | 11 ++++++ .../com/gunshi/project/xyt/model/StRsvrR.java | 11 ++++++ 8 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/StFlowR.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/StImgR.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/StPptnR.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/StRsvrR.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java index df762e5..7cfcfdf 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java @@ -50,7 +50,7 @@ public class BzProtocolInfoController { @Operation(summary = "删除协议信息") @GetMapping("/delete/{id}") - public R delete(@PathVariable String id) { + public R delete(@PathVariable("id") String id) { return R.ok(dao.removeById(id)); } diff --git a/src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java b/src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java new file mode 100644 index 0000000..388ebd4 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java @@ -0,0 +1,37 @@ +package com.gunshi.project.xyt.enums; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +public enum RcvDataType { + /** + * 雨量数据 + */ + PPTN("PPTN"), + /** + * 水位数据 + */ + RSVR("RSVR"), + /** + * 流量数据 + */ + FLOW("FLOW"), + /** + * 图像数据 + */ + IMG("IMG"); + + private final String value; + + RcvDataType(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java b/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java new file mode 100644 index 0000000..c292803 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java @@ -0,0 +1,24 @@ +package com.gunshi.project.xyt.model; + +import lombok.Data; + +import java.util.Date; + +/** + * 报文日志 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +@Data +public class RcvLogDownR { + private Long id; + private Long protocolId; + private String msg; + private Date sendTm; + private String encoded; + private String rtuid; + private String funcode; + private Long arkId; +} diff --git a/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java b/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java new file mode 100644 index 0000000..c60fa42 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java @@ -0,0 +1,28 @@ +package com.gunshi.project.xyt.model; + +import lombok.Data; + +import java.util.Date; + +/** + * 报文日志 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +@Data +public class RcvLogUpR { + private Long id; + private Long protocolId; + private String originalMsg; + private Date receiveTm; + private String decoded; + private Date decodedTm; + private String rtuid; + private String funcode; + private Date observeTm; + private Integer partialSize; + private Integer partialIndex; + private Long arkId; +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StFlowR.java b/src/main/java/com/gunshi/project/xyt/model/StFlowR.java new file mode 100644 index 0000000..6d1a31a --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StFlowR.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.model; + +/** + * 流量数据 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +public class StFlowR { +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StImgR.java b/src/main/java/com/gunshi/project/xyt/model/StImgR.java new file mode 100644 index 0000000..65facb7 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StImgR.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.model; + +/** + * 图像数据 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +public class StImgR { +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StPptnR.java b/src/main/java/com/gunshi/project/xyt/model/StPptnR.java new file mode 100644 index 0000000..0ee8219 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StPptnR.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.model; + +/** + * 雨量数据 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +public class StPptnR { +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java b/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java new file mode 100644 index 0000000..a9953f9 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.model; + +/** + * 水位数据 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-25 + */ +public class StRsvrR { +}