From a065477c7b1d227b9ac4a766210c08d03abc61d7 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 29 Dec 2024 16:01:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9B=91=E6=B5=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=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(); + } }