From b6ed506d6911dfa9383d1a493f2d1927da14ea39 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Mon, 29 Jan 2024 15:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=B1=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/StRcvRealController.java | 58 +++++++++++++++++++ .../gunshi/project/xyt/model/StRcvReal.java | 48 +++++++++++++++ .../com/gunshi/project/xyt/model/StRsvrR.java | 4 +- .../xyt/service/ProtocolInfoService.java | 2 +- .../gunshi/project/xyt/so/StRcvRealSo.java | 33 +++++++++++ 5 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/StRcvReal.java create mode 100644 src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java b/src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java new file mode 100644 index 0000000..6fb0900 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java @@ -0,0 +1,58 @@ +package com.gunshi.project.xyt.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.core.result.R; +import com.gunshi.project.xyt.model.StRcvReal; +import com.gunshi.project.xyt.model.StRcvRealAutoDao; +import com.gunshi.project.xyt.so.StRcvRealSo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 监测类数据实时表 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-29 + */ +@RestController +@Tag(name = "统一接收-监测类数据实时表") +@RequestMapping("/rcv/real") +public class StRcvRealController { + + @Autowired + private StRcvRealAutoDao dao; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public R> page(@RequestBody StRcvRealSo so) { + if (StringUtils.isNotEmpty(so.getStcd())) { + StRcvReal entity = dao.getById(so.getStcd()); + List list = List.of(entity); + return R.ok(new Page(1, 1, 1).setRecords(list)); + } + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(so.getStnm())) { + query.like(StRcvReal::getStnm, so.getStnm()); + } + if (StringUtils.isNotEmpty(so.getSttp())) { + query.eq(StRcvReal::getSttp, so.getSttp()); + } + if (StringUtils.isNotEmpty(so.getProtocolId())) { + query.eq(StRcvReal::getProtocolId, so.getProtocolId()); + } + query.orderByDesc(StRcvReal::getTm); + + return R.ok(dao.page(so.getPageSo().toPage(), query)); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StRcvReal.java b/src/main/java/com/gunshi/project/xyt/model/StRcvReal.java new file mode 100644 index 0000000..8ecf35c --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/StRcvReal.java @@ -0,0 +1,48 @@ +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; + +/** + * 监测类数据实时表对象 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-29 + */ +@Data +@TableName("ST_RCV_REAL") +public class StRcvReal { + @TableId("STCD") + @Schema(description = "测站编码") + private String stcd; + + @TableField("TM") + @Schema(description = "采集时间") + private Date tm; + + @TableField("STNM") + @Schema(description = "测站名称") + private String stnm; + + @TableField("STTP") + @Schema(description = "测站类别") + private String sttp; + + @TableField("DATA") + @Schema(description = "最近数据") + private String data; + + @TableField("PROTOCOL_ID") + @Schema(description = "协议ID") + private String protocolId; + + @TableField("PROTOCOL_NAME") + @Schema(description = "协议名称") + private String protocolName; +} diff --git a/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java b/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java index 5f84e73..af3a8b1 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java +++ b/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java @@ -36,7 +36,7 @@ public class StRsvrR { @TableField("RZ") private BigDecimal rz; - @Schema(description = "库水水势") - @TableField("WRPTM") + @Schema(description = "库水水势，4=落，5=涨，6=平") + @TableField("RWPTN") private String rwptn; } diff --git a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java index bb22ca5..7d5aef2 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java @@ -36,7 +36,7 @@ public class ProtocolInfoService { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if (StringUtils.isNotEmpty(so.getName())) { - query.like(StringUtils.isNotEmpty(so.getName()), BzProtocolInfo::getName, so.getName()); + query.like(BzProtocolInfo::getName, so.getName()); } if (StringUtils.isNotEmpty(so.getIp())) { query.like(BzProtocolInfo::getIp, so.getIp()); diff --git a/src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java b/src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java new file mode 100644 index 0000000..5d77177 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java @@ -0,0 +1,33 @@ +package com.gunshi.project.xyt.so; + +import com.gunshi.db.dto.PageSo; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 监测类数据实时表查询对象 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-29 + */ +@Data +@Schema(description = "监测类数据实时表查询对象") +public class StRcvRealSo { + @Schema(description = "分页参数") + @NotNull + private PageSo pageSo; + + @Schema(description = "测站编码") + private String stcd; + + @Schema(description = "测站名称") + private String stnm; + + @Schema(description = "测站类别") + private String sttp; + + @Schema(description = "协议ID") + private String protocolId; +}