From b41d8aa4dcc881ef8d7ed47d9850bba9e3678f3b Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 5 Mar 2025 18:02:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20msgtype=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/cz/dto/MonitorConfigDto.java | 2 +- .../java/com/kms/yg/cz/service/MonitorService.java | 3 +++ sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) 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 index cb8fd69b..36fff8ba 100644 --- 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 @@ -37,7 +37,7 @@ public class MonitorConfigDto { private List warnOperators; @ApiModelProperty("预警通知方式") - private MsgTypeEnum msgType; + private List msgType; @ApiModelProperty("信息模板") private String msgTemplate; 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 28c99f90..bda870ef 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 @@ -12,6 +12,7 @@ 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.enmu.MsgTypeEnum; import com.kms.yg.cz.mapper.MonitorConfigMapper; import com.kms.yxgh.base.domain.monitor.MsHdmObp; import com.kms.yxgh.base.domain.monitor.MsHdmRsvr; @@ -139,6 +140,7 @@ public class MonitorService { MonitorConfig monitorConfig = BeanCopyUtils.copy(sp, MonitorConfig.class); assert monitorConfig != null; monitorConfig.setWarnOperators(JSON.toJSONString(sp.getWarnOperators())); + monitorConfig.setMsgType(JSON.toJSONString(sp.getMsgType())); if (monitorConfig.getId() == null) { monitorConfigMapper.insert(monitorConfig); } else { @@ -159,6 +161,7 @@ public class MonitorService { MonitorConfigDto monitorConfigDto = BeanCopyUtils.copy(item, MonitorConfigDto.class); assert monitorConfigDto != null; monitorConfigDto.setWarnOperators(JSON.parseArray(item.getWarnOperators(), OperatorDto.class)); + monitorConfigDto.setMsgType(JSON.parseArray(item.getMsgType(), MsgTypeEnum.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 6f1da7a4..a06abf51 100644 --- a/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql +++ b/sql/sy/v1.6.0/增量脚本/v1.6.0-update.sql @@ -53,9 +53,9 @@ CREATE TABLE `bs_sgc_st_alarm` ( `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_UID` 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_UID` 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='告警信息'; @@ -69,13 +69,13 @@ CREATE TABLE `bs_sgc_st_micfg` ( `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_TYPE` VARCHAR(100) 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_UID` 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_UID` 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='监测配置信息';