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 { +}