From 5696fc14301865b963d098fd17389eac83281682 Mon Sep 17 00:00:00 2001 From: hxh Date: Sat, 21 Dec 2024 18:36:17 +0800 Subject: [PATCH 01/20] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=A3=80=E6=B5=8B=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yg/cz/controller/MonitorController.java | 3 +- .../java/com/kms/yg/cz/enmu/MonitorEnum.java | 3 + .../yxgh/base/domain/monitor/MsHdmPstat.java | 67 ++------ .../yxgh/base/domain/monitor/MsHdmRsvrav.java | 110 ++++++++++++ .../base/domain/monitor/MsHdmRsvrevs.java | 156 ++++++++++++++++++ 5 files changed, 286 insertions(+), 53 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrav.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrevs.java diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java index 62e4eb7e..2e009a50 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java @@ -30,7 +30,6 @@ public class MonitorController { @PostMapping("/page") @ApiOperation("分页查询监测信息") public IPage page(@RequestBody MonitorQueDto sp) { - IPage page = monitorService.pageQuery(sp); - return page; + return monitorService.pageQuery(sp); } } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java index da0cd783..c305ecb3 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java @@ -23,6 +23,9 @@ import java.util.function.Function; public enum MonitorEnum { MS_HDM_RSVR("水库水情监测表", Mock.MS_HDM_RSVR, MsHdmRsvr.class), + MS_HDM_RSVRAV("水库水情多日均值表", MsHdmRsvrav.class), + MS_HDM_RSVREVS("水库水情多日均值表", MsHdmRsvrevs.class), + MS_HDM_PSTAT("降水量统计表", MsHdmPstat.class), MS_HDM_OBP("降水量监测表", Mock.MS_HDM_OBP, MsHdmObp.class), MS_HDM_RIVER("河道水情监测表", Mock.MS_HDM_RIVER, MsHdmRiver.class), MS_DSM_SRVRDS("表面垂直位移监测表", Mock.MS_DSM_SRVRDS, MsHdmSvrds.class), diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java index 61e8099c..d255d69b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java @@ -1,100 +1,65 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_hdm_pstat") @Data @ApiModel("降水量统计表") -public class MsHdmPstat extends SyBaseEntity { +public class MsHdmPstat { - private static final long serialVersionUID = 1L; - - /** - * 测站编码 - */ @ApiModelProperty("测站编码") - @TableField("STCD") + @JSONField(name = "STCD") private String stcd; - /** - * 标志时间 - */ @ApiModelProperty("标志时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("IDTM") + @JSONField(name = "IDTM", format = "yyyy-MM-dd HH:mm:ss") private Date idtm; - /** - * 统计时段标志 - */ @ApiModelProperty("统计时段标志") - @TableField("STTDRCD") + @JSONField(name = "STTDRCD") private String sttdrcd; - /** - * 累计降水量（mm） - */ @ApiModelProperty("累计降水量（mm）") - @TableField("ACCP") - private BigDecimal accp; - /** - * 采集方式 - */ + @JSONField(name = "ACCP") + private String accp; + @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; - /** - * 级联时间 - */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; - /** - * 采集时间 - */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; - /** - * 数据来源 - */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; - /** - * 置信度 - */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; - /** - * 指令ID - */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; - /** - * 入库时间 - */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrav.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrav.java new file mode 100644 index 00000000..c90bd9b6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrav.java @@ -0,0 +1,110 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("ms_hdm_rsvrav") +@Data +@ApiModel("水库水情多日均值表") +public class MsHdmRsvrav { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @JSONField(name = "STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("标志时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "IDTM", format = "yyyy-MM-dd HH:mm:ss") + private Date idtm; + + /** + * 库上水位（m） + */ + @ApiModelProperty("平均库上水位（m）") + @JSONField(name = "AVRZ") + private String avrz; + + /** + * 入库流量（m³/s） + */ + @ApiModelProperty("平均入库流量（m³/s）") + @JSONField(name = "AVINQ") + private String avinq; + + @ApiModelProperty("平均出库流量（m³/s）") + @JSONField(name = "AVOTQ") + private String avotq; + + /** + * 蓄水量 + */ + @ApiModelProperty("平均蓄水量") + @JSONField(name = "AVW") + private String avw; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @JSONField(name = "COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @JSONField(name = "GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @JSONField(name = "RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @JSONField(name = "COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrevs.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrevs.java new file mode 100644 index 00000000..c4cf5050 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvrevs.java @@ -0,0 +1,156 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("ms_hdm_rsvrevs") +@Data +@ApiModel("水库水情极值表") +public class MsHdmRsvrevs { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @JSONField(name = "STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("标志时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "IDTM", format = "yyyy-MM-dd HH:mm:ss") + private Date idtm; + + @ApiModelProperty("统计时段标志") + @JSONField(name = "STTDRCD") + private String sttdrcd; + + @ApiModelProperty("最高库上水位（m）") + @JSONField(name = "HTRZ") + private String htrz; + + @ApiModelProperty("最低库上水位（m）") + @JSONField(name = "LTRZ") + private String ltrz; + + @ApiModelProperty("最大入库流量（m³/s）") + @JSONField(name = "MXINQ") + private String mxinq; + + @ApiModelProperty("最小入库流量（m³/s）") + @JSONField(name = "MNINQ") + private String mninq; + + @ApiModelProperty("最大出库流量（m³/s）") + @JSONField(name = "MXOTQ") + private String mxotq; + + @ApiModelProperty("最小出库流量（m³/s）") + @JSONField(name = "MNOTQ") + private String mnotq; + + @ApiModelProperty("最大蓄水量") + @JSONField(name = "MXW") + private String mxw; + + @ApiModelProperty("最小蓄水量") + @JSONField(name = "MNW") + private String mnw; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最高库水位出现时间") + @JSONField(name = "HTRZTM", format = "yyyy-MM-dd HH:mm:ss") + private Date htrztm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最低库水位出现时间") + @JSONField(name = "LTRZTM", format = "yyyy-MM-dd HH:mm:ss") + private Date ltrztm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最大入库流量出现时间") + @JSONField(name = "MXINQTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mxinqtm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最小入库流量出现时间") + @JSONField(name = "MNINQTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mninqtm; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最大出库流量出现时间") + @JSONField(name = "MXOTQTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mxotqtm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最小出库流量出现时间") + @JSONField(name = "MNOTQTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mnotqtm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最大蓄水量出现时间") + @JSONField(name = "MXWTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mxwtm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最小蓄水量出现时间") + @JSONField(name = "MNWTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mnwtm; + + @ApiModelProperty("采集方式") + @JSONField(name = "COLMT") + private String colmt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @JSONField(name = "GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @JSONField(name = "RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @JSONField(name = "COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; +} From a7ab90ab67ad3ea462719d389aaa4a91a186891d Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 23 Dec 2024 15:45:24 +0800 Subject: [PATCH 02/20] =?UTF-8?q?fix:=20=E8=B0=83=E7=94=A8=E5=A4=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java b/shuili-system/src/main/java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java index e382399d..b524f7cb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java +++ b/shuili-system/src/main/java/com/kms/yxgh/util/DataCenterRestTemplateUtils.java @@ -40,9 +40,6 @@ public class DataCenterRestTemplateUtils { HttpEntity httpEntity = new HttpEntity<>(headers); //通用的方法exchange,这个方法需要你在调用的时候去指定请求类型，可以是get,post,也能是其它类型的请求 ResponseEntity responseEntity = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); - if (responseEntity == null) { - return null; - } log.info("返回报文:{}", JSON.toJSONString(responseEntity)); return responseEntity.getBody(); @@ -59,9 +56,9 @@ public class DataCenterRestTemplateUtils { log.info("请求接口:{}, 请求报文:{}", url, requestStr); HttpHeaders headers = getHttpHeaders(); HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); - ResponseEntity responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class); String seqResult = ""; try { + ResponseEntity responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class); seqResult = responseEntity.getBody(); log.info("请求接口:{}, 请求报文:{}, 返回报文:{}", url, requestStr, seqResult); } catch (Exception e) { From 1ca7e1e672d33a0185b7778af92b2bc599e4dd5f Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 24 Dec 2024 16:45:50 +0800 Subject: [PATCH 03/20] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/enmu/MonitorEnum.java | 8 ++ .../monitor/{MsHdmEnv.java => MsDsmEnv.java} | 83 +++++++-------- .../{MsHdmInhrds.java => MsDsmInhrds.java} | 40 +++---- .../base/domain/monitor/MsDsmInsmonrec.java | 89 ++++++++++++++++ .../yxgh/base/domain/monitor/MsDsmPtmp.java | 81 ++++++++++++++ .../{MsHdmSpqn.java => MsDsmSpqn.java} | 44 ++++---- .../base/domain/monitor/MsHdmGstmonrec.java | 85 +++++++-------- .../yxgh/base/domain/monitor/MsHdmTmpevs.java | 100 ++++++++++++++++++ 8 files changed, 389 insertions(+), 141 deletions(-) rename shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/{MsHdmEnv.java => MsDsmEnv.java} (67%) rename shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/{MsHdmInhrds.java => MsDsmInhrds.java} (72%) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInsmonrec.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPtmp.java rename shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/{MsHdmSpqn.java => MsDsmSpqn.java} (71%) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java index c305ecb3..6667a2f3 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java @@ -30,6 +30,14 @@ public enum MonitorEnum { MS_HDM_RIVER("河道水情监测表", Mock.MS_HDM_RIVER, MsHdmRiver.class), MS_DSM_SRVRDS("表面垂直位移监测表", Mock.MS_DSM_SRVRDS, MsHdmSvrds.class), MS_DSM_SRHRDS("表面水平位移监测表", Mock.MS_DSM_SRHRDS, MsHdmSrhrds.class), + MS_DSM_ENV("环境监测表", MsDsmEnv.class), + MS_HDM_TMPEVS("温度监测表", MsHdmTmpevs.class), + MS_DSM_PTMP("测压管（计）水位监测表", MsDsmPtmp.class), + MS_DSM_SPQN("渗流量监测表", MsDsmSpqn.class), + MS_DSM_GSTMONREC("GNSS状态量监测表", MsHdmGstmonrec.class), + MS_DSM_INSMONREC("惯导监测表", MsDsmInsmonrec.class), + MS_DSM_INHRDS("内部水平位移监测表", MsDsmInhrds.class), + MS_DSM_CKOPDG("裂缝开合度位移监测表", MsHdmCkopdg.class), ; private final String name; diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmEnv.java similarity index 67% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmEnv.java index ba1b7e8d..b5504245 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmEnv.java @@ -1,35 +1,28 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_env") @Data @ApiModel("环境量监测表") -public class MsHdmEnv extends SyBaseEntity { +public class MsDsmEnv { - private static final long serialVersionUID = 1L; - - /** - * 水利工程测站代码 - */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -37,99 +30,99 @@ public class MsHdmEnv extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("时间") - @TableField("TM") + @JSONField(name = "TM", format = "yyyy-MM-dd HH:mm:ss") private Date tm; /** * 地温（℃） */ @ApiModelProperty("地温（℃）") - @TableField("GTP") - private BigDecimal gtp; + @JSONField(name = "GTP") + private String gtp; /** * 瞬时气温（℃） */ @ApiModelProperty("瞬时气温（℃）") - @TableField("AlTP") - private BigDecimal altp; + @JSONField(name = "ALTP") + private String altp; /** * 瞬时气温（℃） */ @ApiModelProperty("瞬时水温（℃）") - @TableField("CTP") - private BigDecimal ctp; + @JSONField(name = "CTP") + private String ctp; /** * 湿度（℃） */ @ApiModelProperty("湿度（℃）") - @TableField("MST") - private BigDecimal mst; + @JSONField(name = "MST") + private String mst; /** * 日蒸发量（mm） */ @ApiModelProperty("日蒸发量（mm）") - @TableField("ED") - private BigDecimal ed; + @JSONField(name = "ED") + private String ed; /** * 当前蒸发（℃） */ @ApiModelProperty("当前蒸发（℃））") - @TableField("EJ") - private BigDecimal ej; + @JSONField(name = "EJ") + private String ej; /** * 气压（kPa） */ @ApiModelProperty("气压（kPa）") - @TableField("ATMP") - private BigDecimal atmp; + @JSONField(name = "ATMP") + private String atmp; /** * 风向 */ @ApiModelProperty("风向") - @TableField("UC") - private BigDecimal uc; + @JSONField(name = "UC") + private String uc; /** * 风力（级） */ @ApiModelProperty("风力（级）") - @TableField("UE") - private BigDecimal ue; + @JSONField(name = "UE") + private String ue; /** * 风速（m/s） */ @ApiModelProperty("风速（m/s）") - @TableField("US") - private BigDecimal us; + @JSONField(name = "US") + private String us; /** * pH值 */ @ApiModelProperty("pH值") - @TableField("PH") - private BigDecimal ph; + @JSONField(name = "PH") + private String ph; /** * 电导率（mS/cm） */ @ApiModelProperty("电导率（mS/cm）") - @TableField("COND") - private BigDecimal cond; + @JSONField(name = "COND") + private String cond; /** * 浊度（°） */ @ApiModelProperty("浊度（°）") - @TableField("TURB") - private BigDecimal turb; + @JSONField(name = "TURB") + private String turb; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** * 级联时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -137,28 +130,28 @@ public class MsHdmEnv extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -166,7 +159,7 @@ public class MsHdmEnv extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInhrds.java similarity index 72% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInhrds.java index 27aed590..8d669800 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInhrds.java @@ -1,36 +1,28 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_inhrds") @Data @ApiModel("内部水平位移监测表") -public class MsHdmInhrds extends SyBaseEntity { +public class MsDsmInhrds { - - private static final long serialVersionUID = 1L; - - /** - * 水利工程测站代码 - */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -38,27 +30,27 @@ public class MsHdmInhrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; /** * X向水平位移（mm） */ @ApiModelProperty("X向水平位移（mm）") - @TableField("XHRDS") - private BigDecimal xhrds; + @JSONField(name = "XHRDS") + private String xhrds; /** * Y向水平位移（mm） */ @ApiModelProperty("Y向水平位移（mm）") - @TableField("YHRDS") - private BigDecimal yhrds; + @JSONField(name = "YHRDS") + private String yhrds; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -66,7 +58,7 @@ public class MsHdmInhrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -74,28 +66,28 @@ public class MsHdmInhrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -103,6 +95,6 @@ public class MsHdmInhrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInsmonrec.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInsmonrec.java new file mode 100644 index 00000000..b714083f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInsmonrec.java @@ -0,0 +1,89 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("ms_dsm_insmonrec") +@Data +@ApiModel("惯导监测表") +public class MsDsmInsmonrec { + + @ApiModelProperty("水利工程测站代码") + @JSONField(name = "PRJ_STCD") + private String prjStcd; + + @ApiModelProperty("测点编号") + @JSONField(name = "MPCD") + private String mpcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + @JSONField(name = "TM", format = "yyyy-MM-dd HH:mm:ss") + private Date tm; + + @ApiModelProperty("X方向加速度") + @JSONField(name = "ACC_X") + private String accX; + + @ApiModelProperty("Y方向加速度") + @JSONField(name = "ACC_Y") + private String accY; + + @ApiModelProperty("Z方向加速度") + @JSONField(name = "ACC_Z") + private String accZ; + + @ApiModelProperty("X方向角度") + @JSONField(name = "ANG_X") + private String angX; + + @ApiModelProperty("Y方向角度") + @JSONField(name = "ANG_Y") + private String angY; + + @ApiModelProperty("Z方向角度") + @JSONField(name = "ANG_Z") + private String angZ; + + @ApiModelProperty("温度") + @JSONField(name = "TEMP") + private String temp; + + @ApiModelProperty("采集方式") + @JSONField(name = "COLMT") + private String colmt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date connTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date collTime; + + @ApiModelProperty("数据来源") + @JSONField(name = "GDWR_DASC") + private String gdwrDasc; + + @ApiModelProperty("置信度") + @JSONField(name = "RELIABILITY") + private String reliability; + + @ApiModelProperty("指令ID") + @JSONField(name = "COMMAND_ID") + private String commandId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPtmp.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPtmp.java new file mode 100644 index 00000000..b1454607 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPtmp.java @@ -0,0 +1,81 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("ms_dsm_ptmp") +@Data +@ApiModel("测压管（计）水位监测表") +public class MsDsmPtmp { + + @ApiModelProperty("水利工程测站代码") + @JSONField(name = "PRJ_STCD") + private String prjStcd; + + @ApiModelProperty("测点编号") + @JSONField(name = "MPCD") + private String mpcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") + private Date pstm; + + @ApiModelProperty("测压管水位") + @JSONField(name = "PZTBWL") + private String pztbwl; + + @ApiModelProperty("扬压力") + @JSONField(name = "UPLIFTED_PRESSURE") + private String upliftedPressure; + + @ApiModelProperty("绕坝渗流") + @JSONField(name = "BYPASS_SEEPAGE") + private String bypassSeepage; + + @ApiModelProperty("频模") + @JSONField(name = "FM") + private String fm; + + @ApiModelProperty("温度") + @JSONField(name = "TEMP") + private String temp; + + @ApiModelProperty("采集方式") + @JSONField(name = "COLMT") + private String colmt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date connTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date collTime; + + @ApiModelProperty("数据来源") + @JSONField(name = "GDWR_DASC") + private String gdwrDasc; + + @ApiModelProperty("置信度") + @JSONField(name = "RELIABILITY") + private String reliability; + + @ApiModelProperty("指令ID") + @JSONField(name = "COMMAND_ID") + private String commandId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java similarity index 71% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java index eb4b56fe..392a2ce8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java @@ -1,36 +1,28 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_spqn") @Data @ApiModel("渗流量监测表") -public class MsHdmSpqn extends SyBaseEntity { +public class MsDsmSpqn { - - private static final long serialVersionUID = 1L; - - /** - * 水利工程测站代码 - */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -38,42 +30,42 @@ public class MsHdmSpqn extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; /** * 温度（℃） */ @ApiModelProperty("温度（℃）") - @TableField("TMP") - private BigDecimal tmp; + @JSONField(name = "TMP") + private String tmp; /** * 渗流量（L/s） */ @ApiModelProperty("渗流量（L/s）") - @TableField("SPQN") - private BigDecimal spqn; + @JSONField(name = "SPQN") + private String spqn; /** * 标准水温渗流量（L/s） */ @ApiModelProperty("标准水温渗流量（L/s）") - @TableField("STSPQN") - private BigDecimal stspqn; + @JSONField(name = "STSPQN") + private String stspqn; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** * 级联时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -81,28 +73,28 @@ public class MsHdmSpqn extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -110,6 +102,6 @@ public class MsHdmSpqn extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java index fd8abb7c..b3fc558e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java @@ -1,36 +1,29 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_gstmonrec") @Data @ApiModel("GNSS状态量监测表") -public class MsHdmGstmonrec extends SyBaseEntity { +public class MsHdmGstmonrec { - private static final long serialVersionUID = 1L; - - /** - * 水利工程测站代码 - */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -38,107 +31,107 @@ public class MsHdmGstmonrec extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("时间") - @TableField("TM") + @JSONField(name = "TM", format = "yyyy-MM-dd HH:mm:ss") private Date tm; /** * GNSS定位状态 */ @ApiModelProperty("GNSS定位状态") - @TableField("STATUS") - private Long status; + @JSONField(name = "STATUS") + private String status; /** * 卫星数 */ @ApiModelProperty("卫星数") - @TableField("SATELLITE_NUM") - private Long satelliteNum; + @JSONField(name = "SATELLITE_NUM") + private String satelliteNum; /** * 经度（°） */ @ApiModelProperty("经度（°）") - @TableField("LGTD") - private BigDecimal lgtd; + @JSONField(name = "LGTD") + private String lgtd; /** * 纬度（°） */ @ApiModelProperty("纬度（°）") - @TableField("LTTD") - private BigDecimal lttd; + @JSONField(name = "LTTD") + private String lttd; /** * 设备电压（mV） */ @ApiModelProperty("设备电压（mV）") - @TableField("VOLTAGE") - private BigDecimal voltage; + @JSONField(name = "VOLTAGE") + private String voltage; /** * 数据是否有效 */ @ApiModelProperty("数据是否有效") - @TableField("VALID") - private Long valid; + @JSONField(name = "VALID") + private String valid; /** * 北向偏移量（mm） */ @ApiModelProperty("北向偏移量（mm）") - @TableField("DEVIATION_Y") - private Long deviationY; + @JSONField(name = "DEVIATION_Y") + private String deviationY; /** * 东向偏移量（mm） */ @ApiModelProperty("东向偏移量（mm）") - @TableField("DEVIATION_X") - private BigDecimal deviationX; + @JSONField(name = "DEVIATION_X") + private String deviationX; /** * 天向（高）偏移量（mm） */ @ApiModelProperty("天向（高）偏移量（mm）") - @TableField("DEVIATION_Z") - private BigDecimal deviationZ; + @JSONField(name = "DEVIATION_Z") + private String deviationZ; /** * 北向距离（m） */ @ApiModelProperty("北向距离（m）") - @TableField("DISTANCE_Y") - private BigDecimal distanceY; + @JSONField(name = "DISTANCE_Y") + private String distanceY; /** * 东向距离（m） */ @ApiModelProperty("东向距离（m）") - @TableField("DISTANCE_X") - private BigDecimal distanceX; + @JSONField(name = "DISTANCE_X") + private String distanceX; /** * 天向距离（m） */ @ApiModelProperty("天向距离（m）") - @TableField("DISTANCE_Z") - private BigDecimal distanceZ; + @JSONField(name = "DISTANCE_Z") + private String distanceZ; /** * 解算结果时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("解算结果时间") - @TableField("SOLVE_TM") + @JSONField(name = "SOLVE_TM", format = "yyyy-MM-dd HH:mm:ss") private Date solveTm; /** * 高程（m） */ @ApiModelProperty("高程（m）") - @TableField("ALT") - private BigDecimal alt; + @JSONField(name = "ALT") + private String alt; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** * 级联时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME") private Date connTime; /** @@ -146,28 +139,28 @@ public class MsHdmGstmonrec extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -175,6 +168,6 @@ public class MsHdmGstmonrec extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java new file mode 100644 index 00000000..da9d9ffc --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java @@ -0,0 +1,100 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("ms_hdm_tmpevs") +@Data +@ApiModel("气温水温极值表") +public class MsHdmTmpevs { + + @ApiModelProperty("测站编号") + @JSONField(name = "STCD") + private String stcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("标志时间") + @JSONField(name = "IDTM", format = "yyyy-MM-dd HH:mm:ss") + private Date idtm; + + @ApiModelProperty("统计时段标志") + @JSONField(name = "STTDRCD") + private String sttdrcd; + + @ApiModelProperty("最高气温（℃）") + @JSONField(name = "MXATMP") + private String mxatmp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最高气温时间") + @JSONField(name = "MXATMPTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mxatmptm; + + @ApiModelProperty("最低气温（℃）") + @JSONField(name = "MNATMP") + private String mnatmp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最低气温时间") + @JSONField(name = "MNATMPTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mnatmptm; + + @ApiModelProperty("最高水温（℃）") + @JSONField(name = "MXWTMP") + private String mxwtmp; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最高水温时间") + @JSONField(name = "MXWTMPTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mxwtmptm; + + @ApiModelProperty("最低水温（℃）") + @JSONField(name = "MNWTMP") + private String mnwtmp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最低水温时间") + @JSONField(name = "MNWTMPTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mnwtmptm; + + + + @ApiModelProperty("采集方式") + @JSONField(name = "COLMT") + private String colmt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date connTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date collTime; + + @ApiModelProperty("数据来源") + @JSONField(name = "GDWR_DASC") + private String gdwrDasc; + + @ApiModelProperty("置信度") + @JSONField(name = "RELIABILITY") + private String reliability; + + @ApiModelProperty("指令ID") + @JSONField(name = "COMMAND_ID") + private String commandId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + +} From a96e80c7c8b9f8836e849afd8b17892838d0877f Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 29 Dec 2024 15:20:10 +0800 Subject: [PATCH 04/20] =?UTF-8?q?feat:=20=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yg/cz/controller/AlarmController.java | 38 +++++++++ .../yg/cz/controller/AttStMpController.java | 85 +++++++++++++++---- .../yg/cz/controller/MonitorController.java | 17 ++++ .../java/com/kms/yg/cz/dto/AlarmInfoDto.java | 37 ++++++++ .../java/com/kms/yg/cz/dto/AlarmQueDto.java | 34 ++++++++ .../java/com/kms/yg/cz/dto/AttMpQueDto.java | 18 ++++ .../java/com/kms/yg/cz/dto/CharInfoDto.java | 54 ++++++++++++ .../kms/yg/cz/dto/CurrentWaterMonitorDto.java | 49 +++++++++++ .../java/com/kms/yg/cz/dto/MonitorQueDto.java | 11 ++- .../java/com/kms/yg/cz/enmu/MarkTypeEnum.java | 59 +++++++++++++ .../kms/yg/cz/enmu/MonitorComposeEnum.java | 41 +++++++++ ...onitorEnum.java => MonitorSourceEnum.java} | 11 +-- .../com/kms/yg/cz/enmu/MonitorTypeEnum.java | 37 ++++++++ .../com/kms/yg/cz/service/AlarmService.java | 19 +++++ .../com/kms/yg/cz/service/AttStMpService.java | 7 ++ .../com/kms/yg/cz/service/MonitorService.java | 18 +++- .../sk/controller/AttResBaseController.java | 11 ++- .../java/com/kms/yg/sk/domain/AttResCode.java | 23 +++++ .../com/kms/yg/sk/domain/AttResRfkwlv.java | 41 +++++++++ .../kms/yg/sk/mapper/AttResCodeMapper.java | 17 ++++ .../kms/yg/sk/mapper/AttResRfkwlvMapper.java | 17 ++++ .../kms/yg/sk/service/AttResCodeService.java | 19 +++++ .../{MsHdmSppr.java => MsDsmSppr.java} | 79 ++++------------- .../yxgh/common/enums/DataSyncBasicEnum.java | 3 + sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql | 12 +++ 25 files changed, 663 insertions(+), 94 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java rename shuili-system/src/main/java/com/kms/yg/cz/enmu/{MonitorEnum.java => MonitorSourceEnum.java} (98%) create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java rename shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/{MsHdmSppr.java => MsDsmSppr.java} (55%) create mode 100644 sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java new file mode 100644 index 00000000..99b43362 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java @@ -0,0 +1,38 @@ +package com.kms.yg.cz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yg.cz.dto.AlarmInfoDto; +import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yg.cz.service.AlarmService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +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; + + +/** + * 监测信息Controller + * + * @author kms + * @date 2024-04-24 + */ +@RestController +@RequestMapping("/cz/alarm") +@AllArgsConstructor +@Api(tags = "监测告警信息") +public class AlarmController { + + private final AlarmService alarmService; + + + @PostMapping("/page") + @ApiOperation("分页查询监测信息") + public IPage page(@RequestBody MonitorQueDto sp) { + return alarmService.pageQuery(sp); + } + + +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java index cf2237b7..5cbefa0f 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java @@ -1,19 +1,21 @@ package com.kms.yg.cz.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yg.cz.domain.AttStMp; +import com.kms.yg.cz.dto.AttMpQueDto; import com.kms.yg.cz.service.AttStMpService; -import com.shuili.common.annotation.Log; +import com.kms.yxgh.base.Response; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.enums.BusinessType; -import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; @@ -31,19 +33,9 @@ public class AttStMpController extends BaseController { private AttStMpService attStMpService; @PostMapping("/list") - @ApiOperation("测点基础信息列表") - public IPage list(@RequestBody SearchParam sp) { - return attStMpService.selectPage(sp); - } - - - @Log(title = "测点基础信息导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("测点基础信息导出") - public AjaxResult export(@RequestBody AttStMp attStMp) { - List list = attStMpService.listByIds(attStMp.getIds()); - ExcelUtil util = new ExcelUtil<>(AttStMp.class); - return util.exportExcel(list, "base"); + @ApiOperation("测点基础信息列表(不分页)") + public Response> list(@RequestBody AttMpQueDto sp) { + return Response.ok(attStMpService.selectList(sp)); } @ApiOperation("测点基础信息详情") @@ -52,4 +44,61 @@ public class AttStMpController extends BaseController { return AjaxResult.success(attStMpService.getById(id)); } + @ApiOperation("测点要素树") + @GetMapping(value = "/tree") + public AjaxResult getTree() { + List tree = new ArrayList<>(); + tree.add(Item.builder().key("1").value("环境量监测").children(env()).build()); + tree.add(Item.builder().key("2").value("渗流监测").children(sl()).build()); + tree.add(Item.builder().key("3").value("变形监测").children(bx()).build()); + return AjaxResult.success(tree); + } + + private List bx() { + List bx = new ArrayList<>(); + bx.add(Item.builder().key("DSM01").value("GNSS").build()); + bx.add(Item.builder().key("MEMS").value("惯导").build()); + bx.add(Item.builder().key("DSM03").value("测斜").build()); + bx.add(Item.builder().key("DSM04").value("测缝").build()); + bx.add(Item.builder().key("DSM05").value("应力").build()); + bx.add(Item.builder().key("DSM06").value("应变").build()); + bx.add(Item.builder().key("DSM07").value("土压力").build()); + bx.add(Item.builder().key("DSM08").value("锚杆").build()); + bx.add(Item.builder().key("DSM09").value("引张线").build()); + bx.add(Item.builder().key("DSM10").value("倒垂").build()); + bx.add(Item.builder().key("DSM11").value("双金属标").build()); + bx.add(Item.builder().key("DSM12").value("静力水准").build()); + bx.add(Item.builder().key("DSM13").value("几何水准").build()); + bx.add(Item.builder().key("DSM14").value("视准线").build()); + bx.add(Item.builder().key("DSM15").value("全站仪").build()); + return bx; + } + + private List env() { + List env = new ArrayList<>(); + env.add(Item.builder().key("DSM22").value("气温").build()); + env.add(Item.builder().key("DSM24").value("水温").build()); + return env; + } + + private List sl() { + List sl = new ArrayList<>(); + sl.add(Item.builder().key("DSM16").value("扬压力").build()); + sl.add(Item.builder().key("DSM17").value("渗透压力").build()); + sl.add(Item.builder().key("DSM18").value("绕坝渗流").build()); + sl.add(Item.builder().key("DSM19").value("渗流量").build()); + return sl; + } + + @Data + @Builder + @AllArgsConstructor + @NoArgsConstructor + public static class Item { + private String key; + private String value; + private List children = new ArrayList<>(); + } + + } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java index 2e009a50..7a1f5889 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java @@ -1,8 +1,11 @@ package com.kms.yg.cz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yg.cz.dto.CurrentWaterMonitorDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.cz.service.MonitorService; +import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -32,4 +35,18 @@ public class MonitorController { public IPage page(@RequestBody MonitorQueDto sp) { return monitorService.pageQuery(sp); } + + @PostMapping("/watter") + @ApiOperation("查询当前水情监测信息") + public Response watter(@RequestBody MonitorQueDto sp) { + CurrentWaterMonitorDto infoDto = monitorService.watter(sp); + return Response.ok(infoDto); + } + + @PostMapping("/chart") + @ApiOperation("查询图表信息") + public Response chart(@RequestBody MonitorQueDto sp) { + CharInfoDto infoDto = monitorService.chart(sp); + return Response.ok(infoDto); + } } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java new file mode 100644 index 00000000..114eb7b8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java @@ -0,0 +1,37 @@ +package com.kms.yg.cz.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("告警信息") +public class AlarmInfoDto { + + @ApiModelProperty(value = "测站名称") + private String stnm; + + @ApiModelProperty(value = "测站编码") + private String stcd; + + @ApiModelProperty(value = "测站类型") + private String sttp; + + @ApiModelProperty(value = "预警类型") + private String alarmType; + + @ApiModelProperty(value = "监测数据") + private String monitorData; + + @ApiModelProperty(value = "预警值") + private String alarmValue; + + @ApiModelProperty(value = "预警时间") + private String alarmTime; + + @ApiModelProperty(value = "预警状态") + private String alarmStatus; + + @ApiModelProperty(value = "告警处置") + private String alarmDisposal; +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java new file mode 100644 index 00000000..c30129a4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java @@ -0,0 +1,34 @@ +package com.kms.yg.cz.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yg.cz.enmu.MonitorComposeEnum; +import com.kms.yg.cz.enmu.MonitorSourceEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("监测告警请求参数") +public class AlarmQueDto { + + @JSONField(name = "START_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "开始时间不能为空") + @ApiModelProperty(value = "开始时间", required = true) + private Date startTime; + + @JSONField(name = "END_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "结束时间不能为空") + @ApiModelProperty(value = "结束时间", required = true) + private Date endTime; + + @ApiModelProperty(value = "页码") + private Integer pageSize = 10; + @ApiModelProperty(value = "每页条数") + private Integer pageNum = 1; +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java new file mode 100644 index 00000000..6fab366e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java @@ -0,0 +1,18 @@ +package com.kms.yg.cz.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +@ApiModel("测点查询Dto") +@Data +public class AttMpQueDto { + + @ApiModelProperty("水库编码") + private String resCode; + + @ApiModelProperty("测点类型") + private String mpType; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java new file mode 100644 index 00000000..ef16de92 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java @@ -0,0 +1,54 @@ +package com.kms.yg.cz.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@ApiModel("图表信息") +@Data +public class CharInfoDto { + @ApiModelProperty(value = "x轴") + private List xAxis; + + @ApiModelProperty(value = "y轴") + private List yAxis; + + @ApiModelProperty(value = "标线") + private List markLine; + + @Data + @ApiModel("y轴") + public static class YAxis { + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "数据") + private List series; + } + + @ApiModel("y轴数据") + @Data + public static class Series { + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "数据") + private List data; + } + + @ApiModel("标线") + @Data + public static class MarkLine { + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "值") + private String value; + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java new file mode 100644 index 00000000..4ad84356 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java @@ -0,0 +1,49 @@ +package com.kms.yg.cz.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("当前水情监测信息") +public class CurrentWaterMonitorDto { + + @ApiModelProperty(value = "当前库水位") + private String currentRz; + + @ApiModelProperty(value = "当前蓄水量") + private String currentW; + + @ApiModelProperty(value = "最大库水位") + private String maxRz; + + @ApiModelProperty(value = "最小库水位") + private String minRz; + + @ApiModelProperty(value = "平均库水位") + private String avgRz; + + @ApiModelProperty(value = "最大库水位时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String maxRzTime; + + @ApiModelProperty(value = "最小库水位时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String minRzTime; + + @ApiModelProperty(value = "日降雨量") + private String dyp; + + @ApiModelProperty(value = "平均降雨量") + private String avgDyp; + + @ApiModelProperty(value = "最大降雨量") + private String maxDyp; + + @ApiModelProperty(value = "最大降雨量时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String maxDypTime; + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java index 2a5d4407..72c7b829 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java @@ -2,7 +2,8 @@ package com.kms.yg.cz.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yg.cz.enmu.MonitorEnum; +import com.kms.yg.cz.enmu.MonitorComposeEnum; +import com.kms.yg.cz.enmu.MonitorSourceEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,9 +15,11 @@ import java.util.Date; @ApiModel("监测信息请求参数") public class MonitorQueDto { - @NotNull(message = "监测类型不能为空") - @ApiModelProperty(value = "监测类型", required = true, allowableValues = "MS_HDM_RSVR,MS_HDM_OBP,MS_HDM_RIVER,MS_DSM_SRVRDS,MS_DSM_SRHRDS") - private MonitorEnum monitorType; + @ApiModelProperty(value = "监测要素") + private MonitorComposeEnum elementType; + + @ApiModelProperty(value = "监测数据来源类型") + private MonitorSourceEnum monitorType; @JSONField(name = "STCD") @ApiModelProperty(value = "测站编码") diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java new file mode 100644 index 00000000..056863f3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java @@ -0,0 +1,59 @@ +package com.kms.yg.cz.enmu; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yg.sk.mapper.AttResRfkwlvMapper; +import com.kms.yg.sk.mapper.AttResRsppMapper; +import com.shuili.common.utils.SpringUtils; +import com.shuili.common.utils.StringUtils; +import lombok.Getter; + +import java.util.List; +import java.util.Map; + +@Getter +public enum MarkTypeEnum { + + FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "fsltdz", AttResRfkwlvMapper.class), + CHFLLV("校准洪核水位", "m", Constants.DEFAULT_KEY_FIELD, "chfllv", AttResRsppMapper.class), + ; + + private final String zhName; + private final String unit; + private final String keyField; + private final String valueField; + private final Class clazz; + + MarkTypeEnum(String zhName, String unit, String keyField, String valueField, Class clazz) { + this.zhName = zhName; + this.unit = unit; + this.keyField = keyField; + this.valueField = valueField; + this.clazz = clazz; + } + + + public CharInfoDto.MarkLine toMarkLine(String code) { + CharInfoDto.MarkLine markLine = new CharInfoDto.MarkLine(); + markLine.setName(zhName + "(" + unit + ")"); + markLine.setValue("0"); + if (StringUtils.isEmpty(code)) { + return markLine; + } + BaseMapper mapper = SpringUtils.getBean(clazz); + List> results = mapper.selectMaps(new QueryWrapper<>().select(valueField).eq(keyField, code)); + if (!results.isEmpty()) { + Map result = results.get(0); + String value = result.get(valueField).toString(); + if (StringUtils.isNotBlank(value)) { + markLine.setValue(value); + } + } + return markLine; + } + + public final static class Constants { + public static final String DEFAULT_KEY_FIELD = "ID"; + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java new file mode 100644 index 00000000..07b91632 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -0,0 +1,41 @@ +package com.kms.yg.cz.enmu; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Collectors; + + +@Getter +public enum MonitorComposeEnum { + +// WATER_LEVEL(Arrays.asList(MonitorTypeEnum.WATER_LEVEL, MonitorTypeEnum.RAINFALL)), +// ENV(Arrays.asList(MonitorTypeEnum.AIR_TEMPE, MonitorTypeEnum.WATER_TEMPE)), + ; + + + private final List leftElements; + private final List rightElements; + private final Supplier leftName; + private final Supplier leftUnit; + private final Supplier rightName; + private final Supplier rightUnit; + + + MonitorComposeEnum(List leftElements, List rightElements) { + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = () -> leftElements.stream().map(MonitorTypeEnum::getZhName).collect(Collectors.joining("/")); + this.leftUnit = () -> leftElements.stream().map(MonitorTypeEnum::getUnit).distinct().collect(Collectors.joining("/")); + this.rightName = () -> rightElements.stream().map(MonitorTypeEnum::getZhName).collect(Collectors.joining("/")); + this.rightUnit = () -> rightElements.stream().map(MonitorTypeEnum::getUnit).distinct().collect(Collectors.joining("/")); + } + +// public List getSource() { +// return elements.stream().map(MonitorTypeEnum::getSource).distinct().collect(Collectors.toList()); +// } + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java rename to shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java index 8ce2b221..cab9f086 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java @@ -20,7 +20,7 @@ import java.util.function.Function; * @date 2024/3/4 18:57 */ @Getter -public enum MonitorEnum { +public enum MonitorSourceEnum { MS_HDM_RSVR("水库水情监测表", Mock.MS_HDM_RSVR, MsHdmRsvr.class), MS_HDM_RSVRAV("水库水情多日均值表", MsHdmRsvrav.class), @@ -38,6 +38,7 @@ public enum MonitorEnum { MS_DSM_INSMONREC("惯导监测表", MsDsmInsmonrec.class), MS_DSM_INHRDS("内部水平位移监测表", MsDsmInhrds.class), MS_DSM_CKOPDG("裂缝开合度位移监测表", MsHdmCkopdg.class), + MS_DSM_SPPR("渗透压力监测表", MsDsmSppr.class), ; private final String zhName; @@ -46,20 +47,20 @@ public enum MonitorEnum { private final Class clazz; - MonitorEnum(String zhName, Class clazz) { + MonitorSourceEnum(String zhName, Class clazz) { this(zhName, Mock.DEFAULT, MonitorTypeEnum.MONITOR, clazz); } - MonitorEnum(String zhName, String mockData, Class clazz) { + MonitorSourceEnum(String zhName, String mockData, Class clazz) { this(zhName, mockData, MonitorTypeEnum.MONITOR, clazz); } - MonitorEnum(String zhName, MonitorTypeEnum type, Class clazz) { + MonitorSourceEnum(String zhName, MonitorTypeEnum type, Class clazz) { this(zhName, Mock.DEFAULT, type, clazz); } - MonitorEnum(String zhName, String mockData, MonitorTypeEnum type, Class clazz) { + MonitorSourceEnum(String zhName, String mockData, MonitorTypeEnum type, Class clazz) { this.zhName = zhName; this.type = type; this.mockData = mockData; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java new file mode 100644 index 00000000..85903d6e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java @@ -0,0 +1,37 @@ +package com.kms.yg.cz.enmu; + +import lombok.Getter; + +@Getter +public enum MonitorTypeEnum { + WATER_LEVEL("水位", MonitorSourceEnum.MS_HDM_RSVR, "rz", "collTime", "m", MarkTypeEnum.FSLTDZ_LIMIT), + RAINFALL("降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm", MarkTypeEnum.CHFLLV), + AIR_TEMPE("气温", MonitorSourceEnum.MS_DSM_ENV, "aitp", "tm", "℃"), + WATER_TEMPE("水温", MonitorSourceEnum.MS_DSM_ENV, "ctp", "tm", "℃"), + UPLIFTED_PRESSURE("扬压力", MonitorSourceEnum.MS_DSM_PTMP, "upliftedPressure", "mstm", "MPa"), + PERMEABILITY_PRESSURE("渗透压力", MonitorSourceEnum.MS_DSM_SPPR, "spprwl", "mstm", "MPa"), + + ; + + private final String zhName; + private final MonitorSourceEnum source; + private final String valueField; + private final String timeField; + private final String unit; + private final MarkTypeEnum markType; + + MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit) { + this(zhName, source, valueField, timeField, unit, null); + } + + MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit, MarkTypeEnum markType) { + this.zhName = zhName; + this.source = source; + this.valueField = valueField; + this.unit = unit; + this.markType = markType; + this.timeField = timeField; + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java new file mode 100644 index 00000000..332004e7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java @@ -0,0 +1,19 @@ +package com.kms.yg.cz.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.cz.dto.AlarmInfoDto; +import com.kms.yg.cz.dto.MonitorQueDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +@Service +@Slf4j +public class AlarmService { + + + public IPage pageQuery(MonitorQueDto sp) { + return new Page<>(); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java index 11d57cba..3d28f850 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java @@ -1,10 +1,14 @@ package com.kms.yg.cz.service; import com.kms.yg.cz.domain.AttStMp; +import com.kms.yg.cz.dto.AttMpQueDto; import com.kms.yg.cz.mapper.AttStMpMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + /** * 【请填写功能名称】Service接口 * @@ -14,4 +18,7 @@ import org.springframework.stereotype.Service; @Service public class AttStMpService extends BaseService { + public List selectList(AttMpQueDto sp) { + return Collections.emptyList(); + } } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 08d06211..8b8584a6 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -1,8 +1,10 @@ package com.kms.yg.cz.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yg.cz.dto.CurrentWaterMonitorDto; import com.kms.yg.cz.dto.MonitorQueDto; -import com.kms.yg.cz.enmu.MonitorEnum; +import com.kms.yg.cz.enmu.MonitorSourceEnum; import com.kms.yxgh.util.DataCenterRestTemplateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -27,19 +29,27 @@ public class MonitorService { public IPage pageQuery(MonitorQueDto queDto) { - MonitorEnum table = queDto.getMonitorType(); + MonitorSourceEnum table = queDto.getMonitorType(); String path = paths.get(table.getTableName()); if (path == null) { log.error("未找到对应的路径配置, table:{}", table); return table.getMockData(queDto); } String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); - MonitorEnum.ResultWrapper resultWrapper = new MonitorEnum.ResultWrapper(); + MonitorSourceEnum.ResultWrapper resultWrapper = new MonitorSourceEnum.ResultWrapper(); resultWrapper.setResultJson(json); resultWrapper.setQueDto(queDto); - Function> function = table.getRecords(); + Function> function = table.getRecords(); return function.apply(resultWrapper); } + public CharInfoDto chart(MonitorQueDto sp) { + return null; + } + + public CurrentWaterMonitorDto watter(MonitorQueDto sp) { + + return null; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java index 811e6155..a30c91f5 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java @@ -1,9 +1,8 @@ package com.kms.yg.sk.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sk.domain.AttResBase; import com.kms.yg.sk.service.AttResBaseService; +import com.kms.yg.sk.service.AttResCodeService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -30,6 +29,8 @@ import java.util.List; public class AttResBaseController extends BaseController { @Autowired private AttResBaseService attResBaseService; + @Autowired + private AttResCodeService attResCodeService; @PostMapping("/list") @ApiOperation("水库基础信息列表") @@ -59,4 +60,10 @@ public class AttResBaseController extends BaseController { return AjaxResult.success(attResBaseService.getById(id)); } + @ApiOperation("水库主测站编码") + @GetMapping(value = "/{id}") + public AjaxResult getStcd(@PathVariable("id") String id) { + return AjaxResult.success(attResCodeService.getById(id)); + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java new file mode 100644 index 00000000..f8d97365 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java @@ -0,0 +1,23 @@ +package com.kms.yg.sk.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@TableName("att_res_code") +@Data +@ApiModel("水库编码信息") +public class AttResCode extends BaseEntity { + + @ApiModelProperty("水库编码") + private String resCode; + + @ApiModelProperty("主测站编码") + private String stcd; + + @TableField(exist = false) + private String remark; +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java new file mode 100644 index 00000000..6b267dc9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java @@ -0,0 +1,41 @@ +package com.kms.yg.sk.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@TableName("att_res_rfkwlv") +@Data +public class AttResRfkwlv extends BaseEntity { + + @ApiModelProperty("水库代码") + private String resCode; + + @ApiModelProperty("开启年份") + private String actyr; + + @ApiModelProperty("开启日期") + private String bgmd; + + @ApiModelProperty("汛限水位") + private String rsltdz; + + @ApiModelProperty("结束日期") + private String edmd; + + @ApiModelProperty("汛限库容") + private String flstdw; + + @ApiModelProperty("启用标识") + private String enableFlag; + + @ApiModelProperty("备注") + private String note; + + @TableField(exist = false) + private String remark; + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java new file mode 100644 index 00000000..462302e4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.sk.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sk.domain.AttResCode; +import org.springframework.stereotype.Repository; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-24 + */ +@Repository +public interface AttResCodeMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java new file mode 100644 index 00000000..a7596c0a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.sk.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sk.domain.AttResRfkwlv; +import org.springframework.stereotype.Repository; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-24 + */ +@Repository +public interface AttResRfkwlvMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java new file mode 100644 index 00000000..52d8801d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java @@ -0,0 +1,19 @@ +package com.kms.yg.sk.service; + +import com.kms.yg.sk.domain.AttResBase; +import com.kms.yg.sk.domain.AttResCode; +import com.kms.yg.sk.mapper.AttResBaseMapper; +import com.kms.yg.sk.mapper.AttResCodeMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +/** + * 【请填写功能名称】Service接口 + * + * @author kms + * @date 2024-04-24 + */ +@Service +public class AttResCodeService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSppr.java similarity index 55% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSppr.java index fd9a605a..baf0a3a2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSppr.java @@ -1,115 +1,72 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_sppr") @Data @ApiModel("渗流压力水位监测表") -public class MsHdmSppr extends SyBaseEntity { +public class MsDsmSppr { - - private static final long serialVersionUID = 1L; - - /** - * 水利工程测站代码 - */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; - /** - * 测点编号 - */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; - /** - * 测量时间 - */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; - /** - * 温度（℃） - */ @ApiModelProperty("温度（℃）") - @TableField("TMP") - private BigDecimal tmp; - /** - * 渗流压力水位（m） - */ + @JSONField(name = "TMP") + private String tmp; + @ApiModelProperty("渗流压力水位（m）") - @TableField("SPPRWL") - private BigDecimal spprwl; + @JSONField(name = "SPPRWL") + private String spprwl; - /** - * 采集方式 - */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; - /** - * 机构代码 - */ @ApiModelProperty("机构代码") - @TableField("GDWR_OGID") + @JSONField(name = "GDWR_OGID") private String gdwrOgid; - /** - * 级联时间 - */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; - /** - * 采集时间 - */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; - /** - * 数据来源 - */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; - /** - * 置信度 - */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; - /** - * 指令ID - */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; - /** - * 入库时间 - */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java index b68d369d..3f65492c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java @@ -29,7 +29,9 @@ public enum DataSyncBasicEnum { ATT_RES_BASE("水库基础信息", Constants.SK_MAP), ATT_RES_RSPP("水库主要特征", Constants.SK_MAP), + ATT_RES_CODE("水库编码查找表", Constants.SK_MAP), ATT_RES_RWACDR("水库水位、面积和库容关系表", Constants.SK_MAP), + ATT_RES_RFKWLV("水库汛期运用主要特征值表", Constants.SK_MAP), ATT_DIKE_BASE("堤防基础信息", Constants.DF_MAP), ATT_DIKE_BSFST("堤防水文特征", Constants.DF_SWTZ_MAP), ATT_DISC_BASE("堤段基本信息", Constants.DF_DISC_MAP), @@ -44,6 +46,7 @@ public enum DataSyncBasicEnum { ATT_DPDS_BASE("险工险峻信息", Constants.DPDS_MAP), ATT_BAS_BASE("流域基础信息", Constants.BAS_MAP), ATT_ST_BASE("水文水工程监测站基础信息", Constants.ST_MAP, AfterHandler.ST_BASE), + ATT_ST_MP("水工程监测测点信息", Constants.ST_MP_MAP), SYS_XZQH("行政区划基础信息", Constants.XZQH_MAP), ; diff --git a/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql b/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql new file mode 100644 index 00000000..dd39126e --- /dev/null +++ b/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql @@ -0,0 +1,12 @@ +SET NAMES utf8mb4; + +CREATE TABLE `bs_sgc_st_mon` ( + `STCD` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '测站编码', + `MON_PROJ` VARCHAR(50) COLLATE utf8mb4_general_ci COMMENT '测站监测要素', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水文水工程监测站基础信息'; + +CREATE INDEX bs_sgc_st_mon_STCD_IDX USING BTREE ON bs_sgc_st_mon (STCD); \ No newline at end of file From 37b1b125905d768c2aef8758e20a48cd6d4f5905 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 29 Dec 2024 15:25:17 +0800 Subject: [PATCH 05/20] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=B0=B4?= =?UTF-8?q?=E5=88=A9=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sk/controller/AttResBaseController.java | 22 +++++-------------- .../kms/yg/sk/service/AttResBaseService.java | 8 ++++++- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java index a30c91f5..5f3db6a6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java @@ -1,21 +1,18 @@ package com.kms.yg.sk.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sk.domain.AttResBase; import com.kms.yg.sk.service.AttResBaseService; import com.kms.yg.sk.service.AttResCodeService; -import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.enums.BusinessType; -import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 水库基础信息Controller @@ -34,26 +31,17 @@ public class AttResBaseController extends BaseController { @PostMapping("/list") @ApiOperation("水库基础信息列表") - public AjaxResult list(@RequestBody SearchParam sp) { + public IPage list(@RequestBody SearchParam sp) { AttResBase body = sp.getData(); if (body == null) { - return AjaxResult.success(); + return new Page<>(); } body.setPageNum(sp.getPageNum()); body.setPageSize(sp.getPageSize()); - return attResBaseService.selectPage(body); + return attResBaseService.selectPageV2(body); } - @Log(title = "水库基础信息导出", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ApiOperation("水库基础信息导出") - public AjaxResult export(@RequestBody AttResBase attResBase) { - List list = attResBaseService.listByIds(attResBase.getIds()); - ExcelUtil util = new ExcelUtil<>(AttResBase.class); - return util.exportExcel(list, "base"); - } - @ApiOperation("水库基础信息详情") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java index 565d11c9..7d9014ab 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java @@ -1,9 +1,12 @@ package com.kms.yg.sk.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sk.domain.AttResBase; import com.kms.yg.sk.mapper.AttResBaseMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; + /** * 【请填写功能名称】Service接口 * @@ -11,6 +14,9 @@ import org.springframework.stereotype.Service; * @date 2024-04-24 */ @Service -public class AttResBaseService extends BaseService{ +public class AttResBaseService extends BaseService { + public IPage selectPageV2(AttResBase body) { + return new Page<>(); + } } From 602a4549009741b0b3abe8b934a72692bab9dc75 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 29 Dec 2024 15:39:05 +0800 Subject: [PATCH 06/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Durl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/sk/controller/AttResBaseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java index 5f3db6a6..7ab9e186 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java @@ -49,7 +49,7 @@ public class AttResBaseController extends BaseController { } @ApiOperation("水库主测站编码") - @GetMapping(value = "/{id}") + @GetMapping(value = "/stcd/{id}") public AjaxResult getStcd(@PathVariable("id") String id) { return AjaxResult.success(attResCodeService.getById(id)); } From a065477c7b1d227b9ac4a766210c08d03abc61d7 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 29 Dec 2024 16:01:45 +0800 Subject: [PATCH 07/20] =?UTF-8?q?feat:=20=E7=9B=91=E6=B5=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yg/cz/controller/MonitorController.java | 20 ++++++-- .../com/kms/yg/cz/dto/MonitorConfigDto.java | 51 +++++++++++++++++++ .../java/com/kms/yg/cz/enmu/MsgTypeEnum.java | 18 +++++++ .../com/kms/yg/cz/service/MonitorService.java | 11 ++++ 4 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java index 7a1f5889..38fe74dd 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java @@ -3,16 +3,16 @@ package com.kms.yg.cz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; +import com.kms.yg.cz.dto.MonitorConfigDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.cz.service.MonitorService; import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -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 org.springframework.web.bind.annotation.*; + +import java.util.List; /** @@ -49,4 +49,16 @@ public class MonitorController { CharInfoDto infoDto = monitorService.chart(sp); return Response.ok(infoDto); } + + @PostMapping("/config") + @ApiOperation("设置监测配置信息") + public Response config(@RequestBody MonitorConfigDto sp) { + return Response.ok(monitorService.config(sp)); + } + + @GetMapping("/config/list/{stcd}") + @ApiOperation("查询监测配置信息") + public Response> configList(@PathVariable("stcd") String stcd) { + return Response.ok(monitorService.configList(stcd)); + } } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java new file mode 100644 index 00000000..cb8fd69b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java @@ -0,0 +1,51 @@ +package com.kms.yg.cz.dto; + +import com.kms.yg.cz.enmu.MsgTypeEnum; +import com.kms.yxgh.common.dto.OperatorDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel("监测配置信息") +public class MonitorConfigDto { + + @ApiModelProperty("监测配置ID") + private String id; + + @ApiModelProperty("水库编码") + private String resCode; + + @ApiModelProperty("水库名称") + private String resName; + + @ApiModelProperty("监测类型") + private String mpType; + + @ApiModelProperty("测站编码") + private String stcd; + + @ApiModelProperty("预警类型") + private String warnType; + + @ApiModelProperty("预警值") + private String warnValue; + + @ApiModelProperty("预警通知人") + private List warnOperators; + + @ApiModelProperty("预警通知方式") + private MsgTypeEnum msgType; + + @ApiModelProperty("信息模板") + private String msgTemplate; + + @ApiModelProperty("预警通知间隔") + private Integer warnInterval; + + @ApiModelProperty("预警时间单位") + private String warnTimeUnit; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java new file mode 100644 index 00000000..10eb8018 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java @@ -0,0 +1,18 @@ +package com.kms.yg.cz.enmu; + +import lombok.Getter; + +@Getter +public enum MsgTypeEnum { + //站内信，短信 + SITE_MSG(1, "站内信"), + SMS_MSG(2, "短信"); + + private final Integer code; + private final String msg; + + MsgTypeEnum(Integer code, String msg) { + this.code = code; + this.msg = msg; + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 8b8584a6..8e7250f5 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -3,6 +3,7 @@ package com.kms.yg.cz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; +import com.kms.yg.cz.dto.MonitorConfigDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.cz.enmu.MonitorSourceEnum; import com.kms.yxgh.util.DataCenterRestTemplateUtils; @@ -11,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.function.Function; @@ -52,4 +55,12 @@ public class MonitorService { return null; } + + public MonitorConfigDto config(MonitorConfigDto sp) { + return null; + } + + public List configList(String stcd) { + return Collections.emptyList(); + } } From 9a69a4d96508781e99b3d3bb9062d57e55b5af05 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 29 Dec 2024 21:10:07 +0800 Subject: [PATCH 08/20] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=92=8C=E8=A7=84=E5=88=99=E6=8E=A5=E5=8F=A3=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yg/cz/controller/AlarmController.java | 3 +- .../java/com/kms/yg/cz/domain/AlarmInfo.java | 52 +++++++++++++ .../java/com/kms/yg/cz/domain/BsSgcStMon.java | 2 +- .../com/kms/yg/cz/domain/MonitorConfig.java | 55 ++++++++++++++ .../java/com/kms/yg/cz/dto/AlarmInfoDto.java | 15 +++- .../java/com/kms/yg/cz/dto/AlarmQueDto.java | 5 +- .../com/kms/yg/cz/mapper/AlarmInfoMapper.java | 18 +++++ .../kms/yg/cz/mapper/MonitorConfigMapper.java | 18 +++++ .../com/kms/yg/cz/service/AlarmService.java | 20 ++++- .../com/kms/yg/cz/service/MonitorService.java | 34 ++++++++- sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql | 76 ++++++++++++++++++- 11 files changed, 287 insertions(+), 11 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java index 99b43362..4c8a76bb 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java @@ -2,6 +2,7 @@ package com.kms.yg.cz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yg.cz.dto.AlarmInfoDto; +import com.kms.yg.cz.dto.AlarmQueDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.cz.service.AlarmService; import io.swagger.annotations.Api; @@ -30,7 +31,7 @@ public class AlarmController { @PostMapping("/page") @ApiOperation("分页查询监测信息") - public IPage page(@RequestBody MonitorQueDto sp) { + public IPage page(@RequestBody AlarmQueDto sp) { return alarmService.pageQuery(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java b/shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java new file mode 100644 index 00000000..6628aacb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java @@ -0,0 +1,52 @@ +package com.kms.yg.cz.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("bs_sgc_st_alarm") +@ApiModel("告警信息") +public class AlarmInfo extends BaseEntity { + + @ApiModelProperty(value = "水库名称") + private String resName; + + @ApiModelProperty(value = "水库编码") + private String resCode; + + @ApiModelProperty(value = "测站名称") + private String stnm; + + @ApiModelProperty(value = "测站编码") + private String stcd; + + @ApiModelProperty(value = "测站类型") + private String sttp; + + @ApiModelProperty(value = "预警类型") + private String alarmType; + + @ApiModelProperty(value = "监测数据") + private String monitorData; + + @ApiModelProperty(value = "预警值") + private String alarmValue; + + @ApiModelProperty(value = "预警时间") + private Date alarmTime; + + @ApiModelProperty(value = "预警状态") + private String alarmStatus; + + @ApiModelProperty(value = "告警处置") + private String alarmDisposal; + + @TableField(exist = false) + private String remark; +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java b/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java index 39d6219d..1cfa4b93 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java @@ -13,7 +13,7 @@ import java.util.Date; @TableName("bs_sgc_st_mon") @Data -@ApiModel("水文水工程监测站基础信息") +@ApiModel("水文水工程测站监测要素") public class BsSgcStMon { @TableId() diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java b/shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java new file mode 100644 index 00000000..1d23a7db --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java @@ -0,0 +1,55 @@ +package com.kms.yg.cz.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yg.cz.enmu.MsgTypeEnum; +import com.kms.yxgh.common.dto.OperatorDto; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@TableName("bs_sgc_st_micfg") +@ApiModel("监测配置信息") +public class MonitorConfig extends BaseEntity { + + @ApiModelProperty("水库编码") + private String resCode; + + @ApiModelProperty("水库名称") + private String resName; + + @ApiModelProperty("监测类型") + private String mpType; + + @ApiModelProperty("测站编码") + private String stcd; + + @ApiModelProperty("预警类型") + private String warnType; + + @ApiModelProperty("预警值") + private String warnValue; + + @ApiModelProperty("预警通知人") + private String warnOperators; + + @ApiModelProperty("预警通知方式") + private String msgType; + + @ApiModelProperty("信息模板") + private String msgTemplate; + + @ApiModelProperty("预警通知间隔") + private String warnInterval; + + @ApiModelProperty("预警时间单位") + private String warnTimeUnit; + + @TableField(exist = false) + private String remark; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java index 114eb7b8..05ca64d1 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java @@ -1,13 +1,25 @@ package com.kms.yg.cz.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data @ApiModel("告警信息") public class AlarmInfoDto { + @ApiModelProperty(value = "告警信息ID") + private String id; + + @ApiModelProperty(value = "水库名称") + private String resName; + + @ApiModelProperty(value = "水库编码") + private String resCode; + @ApiModelProperty(value = "测站名称") private String stnm; @@ -26,8 +38,9 @@ public class AlarmInfoDto { @ApiModelProperty(value = "预警值") private String alarmValue; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "预警时间") - private String alarmTime; + private Date alarmTime; @ApiModelProperty(value = "预警状态") private String alarmStatus; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java index c30129a4..84eea2b2 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java @@ -2,8 +2,6 @@ package com.kms.yg.cz.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yg.cz.enmu.MonitorComposeEnum; -import com.kms.yg.cz.enmu.MonitorSourceEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,6 +13,9 @@ import java.util.Date; @ApiModel("监测告警请求参数") public class AlarmQueDto { + @ApiModelProperty(value = "水库编码") + private String resCode; + @JSONField(name = "START_TIME", format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @NotNull(message = "开始时间不能为空") diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java b/shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java new file mode 100644 index 00000000..92e03a77 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java @@ -0,0 +1,18 @@ +package com.kms.yg.cz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.cz.domain.AlarmInfo; +import com.kms.yg.cz.domain.AttStBase; +import org.springframework.stereotype.Repository; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-24 + */ +@Repository +public interface AlarmInfoMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java b/shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java new file mode 100644 index 00000000..c7f578b1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java @@ -0,0 +1,18 @@ +package com.kms.yg.cz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.cz.domain.AlarmInfo; +import com.kms.yg.cz.domain.MonitorConfig; +import org.springframework.stereotype.Repository; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-24 + */ +@Repository +public interface MonitorConfigMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java index 332004e7..8688a89d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java @@ -1,10 +1,16 @@ package com.kms.yg.cz.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.cz.domain.AlarmInfo; import com.kms.yg.cz.dto.AlarmInfoDto; -import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yg.cz.dto.AlarmQueDto; +import com.kms.yg.cz.mapper.AlarmInfoMapper; +import com.kms.yxgh.util.BeanCopyUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,8 +18,16 @@ import org.springframework.stereotype.Service; @Slf4j public class AlarmService { + @Autowired + private AlarmInfoMapper alarmInfoMapper; - public IPage pageQuery(MonitorQueDto sp) { - return new Page<>(); + public IPage pageQuery(AlarmQueDto sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + Wrapper wrapper = Wrappers.lambdaQuery() + .between(AlarmInfo::getAlarmTime, sp.getStartTime(), sp.getEndTime()) + .eq(AlarmInfo::getResCode, sp.getResCode()); + IPage result = alarmInfoMapper.selectPage(page, wrapper); + return new Page(result.getCurrent(), result.getSize(), result.getTotal()) + .setRecords(BeanCopyUtils.copyList(result.getRecords(), AlarmInfoDto.class)); } } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 8e7250f5..c50686cf 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -1,11 +1,18 @@ package com.kms.yg.cz.service; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.yg.cz.domain.MonitorConfig; import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; import com.kms.yg.cz.dto.MonitorConfigDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.cz.enmu.MonitorSourceEnum; +import com.kms.yg.cz.mapper.MonitorConfigMapper; +import com.kms.yxgh.common.dto.OperatorDto; +import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.DataCenterRestTemplateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; +import java.util.stream.Collectors; @Service @Slf4j @@ -25,6 +33,9 @@ public class MonitorService { @Autowired private DataCenterRestTemplateUtils dataCenterRestTemplateUtils; + @Autowired + private MonitorConfigMapper monitorConfigMapper; + @Value("${dataSync.url:}") private String dataSyncUrl; @Value("#{${dataSync.paths:{}}}") @@ -57,10 +68,31 @@ public class MonitorService { } public MonitorConfigDto config(MonitorConfigDto sp) { + MonitorConfig monitorConfig = BeanCopyUtils.copy(sp, MonitorConfig.class); + assert monitorConfig != null; + monitorConfig.setWarnOperators(JSON.toJSONString(sp.getWarnOperators())); + if (monitorConfig.getId() == null) { + monitorConfigMapper.insert(monitorConfig); + } else { + monitorConfigMapper.updateById(monitorConfig); + } return null; } public List configList(String stcd) { - return Collections.emptyList(); + Wrapper wrapper = Wrappers.lambdaQuery(MonitorConfig.class) + .eq(MonitorConfig::getStcd, stcd); + List monitorConfigs = monitorConfigMapper.selectList(wrapper); + if (monitorConfigs == null || monitorConfigs.isEmpty()) { + return Collections.emptyList(); + } else { + return monitorConfigs.stream() + .map(item -> { + MonitorConfigDto monitorConfigDto = BeanCopyUtils.copy(item, MonitorConfigDto.class); + assert monitorConfigDto != null; + monitorConfigDto.setWarnOperators(JSON.parseArray(item.getWarnOperators(), OperatorDto.class)); + return monitorConfigDto; + }).collect(Collectors.toList()); + } } } diff --git a/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql b/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql index dd39126e..6f1da7a4 100644 --- a/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql +++ b/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql @@ -7,6 +7,78 @@ CREATE TABLE `bs_sgc_st_mon` ( `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水文水工程监测站基础信息'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水文水工程测站监测要素'; + +CREATE INDEX bs_sgc_st_mon_STCD_IDX USING BTREE ON bs_sgc_st_mon (STCD); + + +CREATE TABLE `att_res_code` ( + `ID` VARCHAR(30) COLLATE utf8mb4_general_ci COMMENT '主键', + `RES_CODE` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '水库编码', + `STCD` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '测站编码', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水库编码信息'; + +CREATE TABLE `att_res_rfkwlv` ( + `ID` VARCHAR(30) COLLATE utf8mb4_general_ci COMMENT '主键', + `RES_CODE` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '水库编码', + `ACTYR` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '开启年份', + `BGMD` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '开启日期', + `RSLTDZ` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '汛限水位', + `EDMD` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '结束日期', + `FLSTDW` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '汛限制库容', + `ENABLE_FLAG` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '启用标识', + `NOTE` TEXT COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水库汛期运用主要特征值表'; + +CREATE TABLE `bs_sgc_st_alarm` ( + `ID` VARCHAR(30) COLLATE utf8mb4_general_ci COMMENT '主键', + `RES_NAME` VARCHAR(100) COLLATE utf8mb4_general_ci COMMENT '水库名称', + `RES_CODE` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '水库编码', + `STNM` VARCHAR(100) COLLATE utf8mb4_general_ci COMMENT '测站名称', + `STCD` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '测站编码', + `STTP` VARCHAR(20) COLLATE utf8mb4_general_ci COMMENT '测站类型', + `ALARM_TYPE` VARCHAR(50) COLLATE utf8mb4_general_ci COMMENT '预警类型', + `MONITOR_DATA` VARCHAR(255) COLLATE utf8mb4_general_ci COMMENT '监测数据', + `ALARM_VALUE` VARCHAR(50) COLLATE utf8mb4_general_ci COMMENT '预警值', + `ALARM_TIME` DATETIME COMMENT '预警时间', + `ALARM_STATUS` VARCHAR(10) COLLATE utf8mb4_general_ci COMMENT '预警状态', + `ALARM_DISPOSAL` VARCHAR(255) COLLATE utf8mb4_general_ci COMMENT '告警处置', + `CREATE_BY` VARCHAR(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建者', + `CREATE_TIME` DATETIME DEFAULT NULL COMMENT '创建时间', + `UPDATE_BY` VARCHAR(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新者', + `UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警信息'; + +CREATE TABLE `bs_sgc_st_micfg` ( + `ID` BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `RES_CODE` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '水库编码', + `RES_NAME` VARCHAR(255) COLLATE utf8mb4_general_ci COMMENT '水库名称', + `MP_TYPE` VARCHAR(40) COLLATE utf8mb4_general_ci COMMENT '监测类型', + `STCD` VARCHAR(18) COLLATE utf8mb4_general_ci COMMENT '测站编码', + `WARN_TYPE` VARCHAR(40) COLLATE utf8mb4_general_ci COMMENT '预警类型', + `WARN_VALUE` VARCHAR(40) COLLATE utf8mb4_general_ci COMMENT '预警值', + `WARN_OPERATORS` TEXT COLLATE utf8mb4_general_ci COMMENT '预警通知人', + `MSG_TYPE` VARCHAR(10) COLLATE utf8mb4_general_ci COMMENT '预警通知方式', + `MSG_TEMPLATE` TEXT COLLATE utf8mb4_general_ci COMMENT '信息模板', + `WARN_INTERVAL` VARCHAR(100) COLLATE utf8mb4_general_ci COMMENT '预警通知间隔', + `WARN_TIME_UNIT` VARCHAR(10) COLLATE utf8mb4_general_ci COMMENT '预警时间单位', + `CREATE_BY` VARCHAR(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建者', + `CREATE_TIME` DATETIME DEFAULT NULL COMMENT '创建时间', + `UPDATE_BY` VARCHAR(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新者', + `UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='监测配置信息'; + + -CREATE INDEX bs_sgc_st_mon_STCD_IDX USING BTREE ON bs_sgc_st_mon (STCD); \ No newline at end of file From 160fde9a2cd5da227b9670499cc1052282297ed2 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 11:59:03 +0800 Subject: [PATCH 09/20] =?UTF-8?q?feat:=20=E6=B0=B4=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yg/cz/dto/CurrentWaterMonitorDto.java | 8 +- .../java/com/kms/yg/cz/dto/MonitorQueDto.java | 3 + .../com/kms/yg/cz/enmu/MonitorSourceEnum.java | 2 +- .../com/kms/yg/cz/service/MonitorService.java | 80 ++++++++++++++++++- 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java index 4ad84356..43709ebe 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data @ApiModel("当前水情监测信息") public class CurrentWaterMonitorDto { @@ -26,11 +28,11 @@ public class CurrentWaterMonitorDto { @ApiModelProperty(value = "最大库水位时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String maxRzTime; + private Date maxRzTime; @ApiModelProperty(value = "最小库水位时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String minRzTime; + private Date minRzTime; @ApiModelProperty(value = "日降雨量") private String dyp; @@ -43,7 +45,7 @@ public class CurrentWaterMonitorDto { @ApiModelProperty(value = "最大降雨量时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String maxDypTime; + private Date maxDypTime; } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java index 72c7b829..ef26f6d4 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java @@ -21,6 +21,9 @@ public class MonitorQueDto { @ApiModelProperty(value = "监测数据来源类型") private MonitorSourceEnum monitorType; + @ApiModelProperty(value = "水库编码") + private String resCode; + @JSONField(name = "STCD") @ApiModelProperty(value = "测站编码") private String stcd; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java index cab9f086..c53bde9f 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java @@ -24,7 +24,7 @@ public enum MonitorSourceEnum { MS_HDM_RSVR("水库水情监测表", Mock.MS_HDM_RSVR, MsHdmRsvr.class), MS_HDM_RSVRAV("水库水情多日均值表", MsHdmRsvrav.class), - MS_HDM_RSVREVS("水库水情多日均值表", MsHdmRsvrevs.class), + MS_HDM_RSVREVS("水库水情极值表", MsHdmRsvrevs.class), MS_HDM_PSTAT("降水量统计表", MsHdmPstat.class), MS_HDM_OBP("降水量监测表", Mock.MS_HDM_OBP, MsHdmObp.class), MS_HDM_RIVER("河道水情监测表", Mock.MS_HDM_RIVER, MsHdmRiver.class), diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index c50686cf..661f094e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.cz.domain.MonitorConfig; import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; @@ -11,9 +12,11 @@ import com.kms.yg.cz.dto.MonitorConfigDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.cz.enmu.MonitorSourceEnum; import com.kms.yg.cz.mapper.MonitorConfigMapper; +import com.kms.yxgh.base.domain.monitor.*; import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.DataCenterRestTemplateUtils; +import com.shuili.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -23,6 +26,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Collectors; @@ -63,8 +67,48 @@ public class MonitorService { } public CurrentWaterMonitorDto watter(MonitorQueDto sp) { + CompletableFuture currentWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVR, sp)); + CompletableFuture avWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVRAV, sp)); + CompletableFuture mxWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVREVS, sp)); + CompletableFuture> currentFlowFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_OBP, sp)); + CompletableFuture> avFlowFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_PSTAT, sp)); + CompletableFuture.allOf(currentWatterFuture, avWatterFuture, mxWatterFuture, currentFlowFuture, avFlowFuture).join(); - return null; + MsHdmRsvr currentWatter = currentWatterFuture.join(); + MsHdmRsvrav avWatter = avWatterFuture.join(); + MsHdmRsvrevs mxWatter = mxWatterFuture.join(); + List currentFlow = currentFlowFuture.join(); + + CurrentWaterMonitorDto currentWaterMonitorDto = new CurrentWaterMonitorDto(); + if (currentWatter != null) { + currentWaterMonitorDto.setCurrentRz(currentWatter.getRz()); + currentWaterMonitorDto.setCurrentW(currentWatter.getW()); + } + if (avWatter != null) { + currentWaterMonitorDto.setAvgRz(avWatter.getAvrz()); + } + if (mxWatter != null) { + currentWaterMonitorDto.setMaxRz(mxWatter.getHtrz()); + currentWaterMonitorDto.setMaxRzTime(mxWatter.getHtrztm()); + currentWaterMonitorDto.setMinRz(mxWatter.getLtrz()); + currentWaterMonitorDto.setMinRzTime(mxWatter.getLtrztm()); + } + if (currentFlow != null && !currentFlow.isEmpty()) { + currentWaterMonitorDto.setDyp(currentFlow.get(0).getDyp()); + currentWaterMonitorDto.setAvgDyp(currentFlow.stream() + .filter(item -> StringUtils.isNotBlank(item.getDrp())) + .mapToDouble(item -> Double.parseDouble(item.getDrp())) + .average().orElse(0) + ""); + currentFlow.stream().max((o1, o2) -> { + double d1 = StringUtils.isNotBlank(o1.getDrp()) ? Double.parseDouble(o1.getDrp()) : 0; + double d2 = StringUtils.isNotBlank(o2.getDrp()) ? Double.parseDouble(o2.getDrp()) : 0; + return Double.compare(d1, d2); + }).ifPresent(item -> { + currentWaterMonitorDto.setMaxDyp(item.getDrp()); + currentWaterMonitorDto.setMaxDypTime(item.getTm()); + }); + } + return currentWaterMonitorDto; } public MonitorConfigDto config(MonitorConfigDto sp) { @@ -95,4 +139,38 @@ public class MonitorService { }).collect(Collectors.toList()); } } + + private T queryDataOne(MonitorSourceEnum source, MonitorQueDto queDto) { + queDto.setPageNum(1); + queDto.setPageSize(1); + IPage page = queryDataPage(source, queDto); + List records = page.getRecords(); + if (records == null || records.isEmpty()) { + return null; + } + return (T) records.get(0); + } + + private List queryDataList(MonitorSourceEnum source, MonitorQueDto queDto) { + queDto.setPageNum(1); + queDto.setPageSize(1000); + IPage page = queryDataPage(source, queDto); + return (List) page.getRecords(); + } + + private IPage queryDataPage(MonitorSourceEnum source, MonitorQueDto queDto) { + MonitorSourceEnum.ResultWrapper resultWrapper = new MonitorSourceEnum.ResultWrapper(); + resultWrapper.setQueDto(queDto); + String path = paths.get(source.getTableName()); + if (path == null) { + resultWrapper.setResultJson(source.getMockData()); + log.error("未找到对应的路径配置, table:{}", source); + return new Page<>(); + } + String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); + resultWrapper.setResultJson(json); + return (IPage) source.getRecords().apply(resultWrapper); + } + + } From 9673deb1016e0a7d8a73ae34af2620a1fd6cfe94 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 14:21:08 +0800 Subject: [PATCH 10/20] =?UTF-8?q?feat:=20=E6=B0=B4=E9=9B=A8=E6=83=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yg/cz/enmu/MonitorComposeEnum.java | 64 +++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index 07b91632..bf77e627 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -1,41 +1,69 @@ package com.kms.yg.cz.enmu; +import cn.hutool.core.collection.CollectionUtil; import lombok.Getter; -import java.util.Arrays; +import java.util.Collections; import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Collectors; @Getter public enum MonitorComposeEnum { -// WATER_LEVEL(Arrays.asList(MonitorTypeEnum.WATER_LEVEL, MonitorTypeEnum.RAINFALL)), -// ENV(Arrays.asList(MonitorTypeEnum.AIR_TEMPE, MonitorTypeEnum.WATER_TEMPE)), + WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), + ENV(Collections.singletonList(MonitorTypeEnum.AIR_TEMPE), "坝址气温", Collections.singletonList(MonitorTypeEnum.WATER_TEMPE), "库水温"), ; - private final List leftElements; + private final String leftName; + private final String leftUnit; private final List rightElements; - private final Supplier leftName; - private final Supplier leftUnit; - private final Supplier rightName; - private final Supplier rightUnit; - + private final String rightName; + private final String rightUnit; MonitorComposeEnum(List leftElements, List rightElements) { this.leftElements = leftElements; this.rightElements = rightElements; - this.leftName = () -> leftElements.stream().map(MonitorTypeEnum::getZhName).collect(Collectors.joining("/")); - this.leftUnit = () -> leftElements.stream().map(MonitorTypeEnum::getUnit).distinct().collect(Collectors.joining("/")); - this.rightName = () -> rightElements.stream().map(MonitorTypeEnum::getZhName).collect(Collectors.joining("/")); - this.rightUnit = () -> rightElements.stream().map(MonitorTypeEnum::getUnit).distinct().collect(Collectors.joining("/")); + this.leftName = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getZhName(); + this.rightName = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getZhName(); + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + + MonitorComposeEnum(List leftElements, List rightElements, String rightName) { + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getZhName(); + this.rightName = rightName; + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + + MonitorComposeEnum(List leftElements, String leftName, List rightElements) { + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = leftName; + this.rightName = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getZhName(); + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); } -// public List getSource() { -// return elements.stream().map(MonitorTypeEnum::getSource).distinct().collect(Collectors.toList()); -// } + MonitorComposeEnum(List leftElements, String leftName, List rightElements, String rightName) { + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = leftName; + this.rightName = rightName; + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + MonitorComposeEnum(List leftElements, String leftName, String leftUnit, List rightElements, String rightName, String rightUnit) { + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = leftName; + this.rightName = rightName; + this.leftUnit = leftUnit; + this.rightUnit = rightUnit; + } } From 59880aaf237725f129ec68d157e5a9aa5b113f00 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 15:58:29 +0800 Subject: [PATCH 11/20] =?UTF-8?q?feat:=20=E5=9B=BE=E8=A1=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/dto/CharInfoDto.java | 9 ++- .../kms/yg/cz/enmu/MonitorComposeEnum.java | 73 ++++++++++++++++++- .../com/kms/yg/cz/service/MonitorService.java | 25 ++++++- 3 files changed, 101 insertions(+), 6 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java index ef16de92..ad9a0dee 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java @@ -4,19 +4,22 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Collections; import java.util.List; @ApiModel("图表信息") @Data public class CharInfoDto { @ApiModelProperty(value = "x轴") - private List xAxis; + private List xAxis = Collections.emptyList(); @ApiModelProperty(value = "y轴") - private List yAxis; + private List yAxis = Collections.emptyList(); + ; @ApiModelProperty(value = "标线") - private List markLine; + private List markLine = Collections.emptyList(); + ; @Data @ApiModel("y轴") diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index bf77e627..1798fbfd 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -1,10 +1,18 @@ package com.kms.yg.cz.enmu; import cn.hutool.core.collection.CollectionUtil; +import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yg.cz.dto.MonitorQueDto; +import com.shuili.common.utils.DateUtils; import lombok.Getter; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.keyvalue.DefaultKeyValue; -import java.util.Collections; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static com.shuili.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS; @Getter @@ -66,4 +74,65 @@ public enum MonitorComposeEnum { this.rightUnit = rightUnit; } + + public CharInfoDto toChar(Map>> dataMap, MonitorQueDto sp) { + CharInfoDto charInfoDto = new CharInfoDto(); + charInfoDto.setXAxis(Stream.concat(this.leftElements.stream(), this.rightElements.stream()) + .flatMap(type -> { + MonitorSourceEnum source = type.getSource(); + return dataMap.get(source).stream().map(map -> map.get(type.getTimeField())); + } + ).filter(Objects::nonNull) + .filter(item -> item instanceof Date) + .map(item -> (Date) item) + .map(date -> DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, date)) + .sorted() + .collect(Collectors.toList())); + List yAxis = new ArrayList<>(); + + if (CollectionUtil.isNotEmpty(this.leftElements)) { + CharInfoDto.YAxis left = new CharInfoDto.YAxis(); + left.setName(this.leftName); + left.setUnit(this.leftUnit); + left.setSeries(getCollect(this.leftElements, this.leftName, dataMap, charInfoDto)); + yAxis.add(left); + } + if (CollectionUtil.isNotEmpty(this.rightElements)) { + CharInfoDto.YAxis right = new CharInfoDto.YAxis(); + right.setName(this.rightName); + right.setUnit(this.rightUnit); + right.setSeries(getCollect(this.rightElements, this.rightName, dataMap, charInfoDto)); + yAxis.add(right); + } + return charInfoDto; + } + + private List getCollect(List element, String name, Map>> dataMap, CharInfoDto charInfoDto) { + return element.stream() + .map(type -> { + CharInfoDto.Series series = new CharInfoDto.Series(); + series.setName(name); + MonitorSourceEnum source = type.getSource(); + Map values = dataMap.get(source).stream() + .map(map -> { + Object time = map.get(type.getTimeField()); + if (time instanceof Date) { + DefaultKeyValue keyValue = new DefaultKeyValue<>(); + keyValue.setKey(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, (Date) time)); + keyValue.setValue(map.get(type.getValueField())); + return keyValue; + } + return null; + }) + .filter(Objects::nonNull) + .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue)); + series.setData(charInfoDto.getXAxis().stream() + .map(time -> { + Object value = values.get(time); + return value == null ? "0" : value.toString(); + }).collect(Collectors.toList())); + return series; + }).collect(Collectors.toList()); + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 661f094e..f2ee4f84 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -10,7 +10,9 @@ import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; import com.kms.yg.cz.dto.MonitorConfigDto; import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yg.cz.enmu.MonitorComposeEnum; import com.kms.yg.cz.enmu.MonitorSourceEnum; +import com.kms.yg.cz.enmu.MonitorTypeEnum; import com.kms.yg.cz.mapper.MonitorConfigMapper; import com.kms.yxgh.base.domain.monitor.*; import com.kms.yxgh.common.dto.OperatorDto; @@ -29,6 +31,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; @Service @Slf4j @@ -63,7 +66,27 @@ public class MonitorService { public CharInfoDto chart(MonitorQueDto sp) { - return null; + MonitorComposeEnum composeEnum = sp.getElementType(); + if (composeEnum == null) { + return new CharInfoDto(); + } + List sourceEnums = Stream.concat(composeEnum.getLeftElements().stream(), composeEnum.getRightElements().stream()) + .map(MonitorTypeEnum::getSource) + .distinct() + .collect(Collectors.toList()); + Map>> dataMap = queryData(sourceEnums, sp); + return composeEnum.toChar(dataMap, sp); + } + + private Map>> queryData(List sourceEnums, MonitorQueDto queDto) { + Map>> futureMap = sourceEnums.stream() + .collect(Collectors.toMap(Function.identity(), item -> CompletableFuture.supplyAsync(() -> queryDataList(item, queDto))) + ); + CompletableFuture.allOf(futureMap.values().toArray(new CompletableFuture[0])).join(); + return futureMap.entrySet().stream() + .collect(Collectors.toMap(Map.Entry::getKey, item -> item.getValue().join().stream() + .map(BeanCopyUtils::copyToMap) + .collect(Collectors.toList()))); } public CurrentWaterMonitorDto watter(MonitorQueDto sp) { From c6674a51fc7fad479d11ba39284229ea3af3c428 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 16:12:28 +0800 Subject: [PATCH 12/20] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java | 6 ++++-- .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index 1798fbfd..537fa7de 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.MonitorQueDto; import com.shuili.common.utils.DateUtils; +import com.shuili.common.utils.StringUtils; import lombok.Getter; import org.apache.commons.collections4.KeyValue; import org.apache.commons.collections4.keyvalue.DefaultKeyValue; @@ -104,6 +105,7 @@ public enum MonitorComposeEnum { right.setSeries(getCollect(this.rightElements, this.rightName, dataMap, charInfoDto)); yAxis.add(right); } + charInfoDto.setYAxis(yAxis); return charInfoDto; } @@ -125,11 +127,11 @@ public enum MonitorComposeEnum { return null; }) .filter(Objects::nonNull) - .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue)); + .collect(Collectors.toMap(KeyValue::getKey, KeyValue::getValue, (v1, v2) -> v2)); series.setData(charInfoDto.getXAxis().stream() .map(time -> { Object value = values.get(time); - return value == null ? "0" : value.toString(); + return value == null || StringUtils.isEmpty(value.toString()) ? "0" : value.toString(); }).collect(Collectors.toList())); return series; }).collect(Collectors.toList()); diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index f2ee4f84..0b3fc65e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.cz.domain.MonitorConfig; import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; @@ -188,7 +187,8 @@ public class MonitorService { if (path == null) { resultWrapper.setResultJson(source.getMockData()); log.error("未找到对应的路径配置, table:{}", source); - return new Page<>(); + IPage page = source.getMockData(queDto); + return (IPage) page; } String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); resultWrapper.setResultJson(json); From 520d3876a9d0a234f93f819016ace90783da05c1 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 16:26:27 +0800 Subject: [PATCH 13/20] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=A0=87?= =?UTF-8?q?=E7=BA=BF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java | 2 +- .../src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java index 056863f3..ce426a48 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java @@ -15,7 +15,7 @@ import java.util.Map; @Getter public enum MarkTypeEnum { - FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "fsltdz", AttResRfkwlvMapper.class), + FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "rsltdz", AttResRfkwlvMapper.class), CHFLLV("校准洪核水位", "m", Constants.DEFAULT_KEY_FIELD, "chfllv", AttResRsppMapper.class), ; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index 537fa7de..f0205efa 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -106,6 +106,11 @@ public enum MonitorComposeEnum { yAxis.add(right); } charInfoDto.setYAxis(yAxis); + charInfoDto.setMarkLine(Stream.concat(this.leftElements.stream(), this.rightElements.stream()) + .map(MonitorTypeEnum::getMarkType) + .filter(Objects::nonNull) + .map(markType -> markType.toMarkLine(sp.getResCode())) + .collect(Collectors.toList())); return charInfoDto; } From 91a4455b6f5164b1300087954ef73f72f37f12ef Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 16:35:51 +0800 Subject: [PATCH 14/20] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java | 3 +-- .../main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java | 6 ++++++ .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java index ef26f6d4..c7fa6c5b 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java @@ -2,7 +2,6 @@ package com.kms.yg.cz.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yg.cz.enmu.MonitorComposeEnum; import com.kms.yg.cz.enmu.MonitorSourceEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +15,7 @@ import java.util.Date; public class MonitorQueDto { @ApiModelProperty(value = "监测要素") - private MonitorComposeEnum elementType; + private String elementType; @ApiModelProperty(value = "监测数据来源类型") private MonitorSourceEnum monitorType; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index f0205efa..40eea8ed 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -142,4 +142,10 @@ public enum MonitorComposeEnum { }).collect(Collectors.toList()); } + public static MonitorComposeEnum getEnum(String name) { + return Arrays.stream(MonitorComposeEnum.values()) + .filter(item -> item.name().equals(name)) + .findFirst() + .orElse(null); + } } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 0b3fc65e..3507ba7e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -65,7 +65,7 @@ public class MonitorService { public CharInfoDto chart(MonitorQueDto sp) { - MonitorComposeEnum composeEnum = sp.getElementType(); + MonitorComposeEnum composeEnum = MonitorComposeEnum.getEnum(sp.getElementType()); if (composeEnum == null) { return new CharInfoDto(); } From 4ebd19b2578ac8ca99e3ba20c759ea1cb461877a Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 17:03:42 +0800 Subject: [PATCH 15/20] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/cz/controller/MonitorController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java index 38fe74dd..b5ee2361 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java @@ -36,7 +36,7 @@ public class MonitorController { return monitorService.pageQuery(sp); } - @PostMapping("/watter") + @PostMapping("/water") @ApiOperation("查询当前水情监测信息") public Response watter(@RequestBody MonitorQueDto sp) { CurrentWaterMonitorDto infoDto = monitorService.watter(sp); From 78c6a10fbc9ffc1ca58e00e32f0e10bb1f4436ce Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 17:06:43 +0800 Subject: [PATCH 16/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B0=B4?= =?UTF-8?q?=E9=9B=A8=E6=83=85=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/service/MonitorService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 3507ba7e..28c99f90 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -13,7 +13,10 @@ import com.kms.yg.cz.enmu.MonitorComposeEnum; import com.kms.yg.cz.enmu.MonitorSourceEnum; import com.kms.yg.cz.enmu.MonitorTypeEnum; import com.kms.yg.cz.mapper.MonitorConfigMapper; -import com.kms.yxgh.base.domain.monitor.*; +import com.kms.yxgh.base.domain.monitor.MsHdmObp; +import com.kms.yxgh.base.domain.monitor.MsHdmRsvr; +import com.kms.yxgh.base.domain.monitor.MsHdmRsvrav; +import com.kms.yxgh.base.domain.monitor.MsHdmRsvrevs; import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.DataCenterRestTemplateUtils; @@ -92,9 +95,8 @@ public class MonitorService { CompletableFuture currentWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVR, sp)); CompletableFuture avWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVRAV, sp)); CompletableFuture mxWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVREVS, sp)); - CompletableFuture> currentFlowFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_OBP, sp)); - CompletableFuture> avFlowFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_PSTAT, sp)); - CompletableFuture.allOf(currentWatterFuture, avWatterFuture, mxWatterFuture, currentFlowFuture, avFlowFuture).join(); + CompletableFuture> currentFlowFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); + CompletableFuture.allOf(currentWatterFuture, avWatterFuture, mxWatterFuture, currentFlowFuture).join(); MsHdmRsvr currentWatter = currentWatterFuture.join(); MsHdmRsvrav avWatter = avWatterFuture.join(); From 2179f9dd7f42ded28f07e07c0a9884aba3e3dee0 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 17:13:37 +0800 Subject: [PATCH 17/20] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A0=91?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/cz/controller/AttStMpController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java index 5cbefa0f..b2cf146d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java @@ -1,5 +1,6 @@ package com.kms.yg.cz.controller; +import com.fasterxml.jackson.annotation.JsonAlias; import com.kms.yg.cz.domain.AttStMp; import com.kms.yg.cz.dto.AttMpQueDto; import com.kms.yg.cz.service.AttStMpService; @@ -96,6 +97,7 @@ public class AttStMpController extends BaseController { @NoArgsConstructor public static class Item { private String key; + @JsonAlias(value = "label") private String value; private List children = new ArrayList<>(); } From 0413f1a6bae420e8000113e47aab84e68691c2cf Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 17:25:16 +0800 Subject: [PATCH 18/20] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/mapper/AttStMpMapper.java | 13 +++++++++++++ .../java/com/kms/yg/cz/service/AttStMpService.java | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java b/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java index cd8b29a9..9eb34630 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java @@ -2,8 +2,12 @@ package com.kms.yg.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.cz.domain.AttStMp; +import com.kms.yg.cz.dto.AttMpQueDto; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 【请填写功能名称】Mapper接口 @@ -14,4 +18,13 @@ import org.springframework.stereotype.Repository; @Repository public interface AttStMpMapper extends BaseMapper { + @Select("") + List selectList(AttMpQueDto sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java index 3d28f850..f312122a 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java @@ -6,7 +6,6 @@ import com.kms.yg.cz.mapper.AttStMpMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** @@ -19,6 +18,6 @@ import java.util.List; public class AttStMpService extends BaseService { public List selectList(AttMpQueDto sp) { - return Collections.emptyList(); + return baseMapper.selectList(sp); } } From 10c17f33c1e14158bc8f7d76ab866a0a9c69d5ae Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 17:29:49 +0800 Subject: [PATCH 19/20] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java b/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java index 9eb34630..3d77808b 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java @@ -3,6 +3,7 @@ package com.kms.yg.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.cz.domain.AttStMp; import com.kms.yg.cz.dto.AttMpQueDto; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @@ -18,13 +19,13 @@ import java.util.List; @Repository public interface AttStMpMapper extends BaseMapper { - @Select("") - List selectList(AttMpQueDto sp); + List selectList(@Param("sp") AttMpQueDto sp); } From 21b92394c233d89de0b738c2c302fb76440dff51 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 30 Dec 2024 17:37:56 +0800 Subject: [PATCH 20/20] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=BA=8F=E5=88=97=E5=8C=96=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/cz/controller/AttStMpController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java index b2cf146d..837a2b31 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java @@ -1,6 +1,7 @@ package com.kms.yg.cz.controller; import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; import com.kms.yg.cz.domain.AttStMp; import com.kms.yg.cz.dto.AttMpQueDto; import com.kms.yg.cz.service.AttStMpService; @@ -97,7 +98,7 @@ public class AttStMpController extends BaseController { @NoArgsConstructor public static class Item { private String key; - @JsonAlias(value = "label") + @JsonProperty(value = "label") private String value; private List children = new ArrayList<>(); }