diff --git a/src/main/java/com/gunshi/project/xyt/controller/RcvLogController.java b/src/main/java/com/gunshi/project/xyt/controller/RcvLogController.java new file mode 100644 index 0000000..2459f7c --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/RcvLogController.java @@ -0,0 +1,22 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.project.xyt.model.RcvLogUpR; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 报文日志数据接口 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-26 + */ +@RestController +@RequestMapping("/rcv/log") +@Tag(name = "统一接收-报文日志数据") +public class RcvLogController { + + //page - page,time,stcd,stnm,protocol +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java index 8d656fd..e373aa1 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java +++ b/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java @@ -4,6 +4,7 @@ import com.gunshi.project.xyt.model.StGateRepairDetail; import com.gunshi.project.xyt.model.StGateRepairRecord; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @author wanyan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Data public class StGateRepairRecordDto extends StGateRepairRecord { diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java index 93324b9..1aa0a92 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java @@ -3,6 +3,7 @@ package com.gunshi.project.xyt.entity.vo; import com.gunshi.project.xyt.model.StGateBHistory; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; /** @@ -12,6 +13,7 @@ import lombok.Data; * @author wanyan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Data public class GateHistoryInfoVo extends StGateBHistory { diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java index 2a4488d..1e33aad 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java @@ -4,6 +4,7 @@ import com.gunshi.project.xyt.model.StGateRepairDetail; import com.gunshi.project.xyt.model.StGateRepairRecord; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @author wanyan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Data public class GateRepairDetailVo extends StGateRepairRecord { diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java index c366391..8448861 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java @@ -3,6 +3,7 @@ package com.gunshi.project.xyt.entity.vo; import com.gunshi.project.xyt.model.StGateRepairRecord; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 闸门详细信息 @@ -11,6 +12,7 @@ import lombok.Data; * @author wanyan * @version 1.0 */ +@EqualsAndHashCode(callSuper = true) @Data public class GateRepairRecordVo extends StGateRepairRecord { diff --git a/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java b/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java index 4668196..dfdbb84 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java +++ b/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java @@ -1,5 +1,9 @@ package com.gunshi.project.xyt.model; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; @@ -12,13 +16,36 @@ import java.util.Date; * @since 2024-01-25 */ @Data +@TableName("RCV_LOG_UP_R") public class RcvLogDownR { + @TableId("ID") private Long id; + + @TableField("PROTOCOL_ID") + @Schema(description = "协议ID") private Long protocolId; + + @TableField("MSG") + @Schema(description = "报文") private String msg; + + @TableField("SEND_TM") + @Schema(description = "发送时间") private Date sendTm; + + @TableField("ENCODED") + @Schema(description = "编码报文") private String encoded; + + @TableField("STCD") + @Schema(description = "测站编码") private String stcd; + + @TableField("FUNCODE") + @Schema(description = "功能码") private String funcode; + + @TableField("ARK_ID") + @Schema(description = "应答ID") 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 index 7df02d7..b729c94 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java +++ b/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java @@ -1,5 +1,9 @@ package com.gunshi.project.xyt.model; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; @@ -12,17 +16,52 @@ import java.util.Date; * @since 2024-01-25 */ @Data +@TableName("RCV_LOG_UP_R") public class RcvLogUpR { + @TableId("ID") private Long id; + + @TableField("PROTOCOL_ID") + @Schema(description = "协议ID") private Long protocolId; + + @TableField("ORIGINAL_MSG") + @Schema(description = "原始报文") private String originalMsg; + + @TableField("RECEIVE_TM") + @Schema(description = "接收时间") private Date receiveTm; + + @TableField("DECODED") + @Schema(description = "解码报文") private String decoded; + + @TableField("DECODED_TM") + @Schema(description = "解码时间") private Date decodedTm; + + @TableField("STCD") + @Schema(description = "测站编码") private String stcd; + + @TableField("FUNCODE") + @Schema(description = "功能码") private String funcode; + + @TableField("OBSERVE_TM") + @Schema(description = "采集时间") private Date observeTm; + + @TableField("PARTIAL_SIZE") + @Schema(description = "分包数量") private Integer partialSize; + + @TableField("PARTIAL_INDEX") + @Schema(description = "分包索引") private Integer partialIndex; + + @TableField("ARK_ID") + @Schema(description = "应答ID") 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 index e7cb6c1..affb8f9 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StFlowR.java +++ b/src/main/java/com/gunshi/project/xyt/model/StFlowR.java @@ -1,5 +1,16 @@ package com.gunshi.project.xyt.model; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.gunshi.core.dateformat.DateFormatString; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + /** * 流量数据 *