From dff2a2b6ec43a31e199a84489629542b99438c97 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Fri, 12 Jan 2024 15:08:49 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=91=8A=E8=AD=A6=E5=8E=86=E5=8F=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarm/config/constants/AlarmConstants.java | 63 +++++++++++++++ .../config/constants/AlarmHandleConstant.java | 64 +++++++++++++++ .../config/entity/AlarmConfigDetailEntity.java | 62 ++++++++++++++ .../alarm/config/entity/AlarmConfigEntity.java | 27 +++++++ .../hzims/alarm/config/entity/AlarmEntity.java | 94 ++++++++++++++++++++++ .../config/entity/AlarmHandleDetailEntity.java | 38 +++++++++ .../alarm/config/entity/AlarmHandleEntity.java | 45 +++++++++++ .../alarm/config/entity/AlarmHistoryEntity.java | 20 +++++ .../hzims/alarm/config/vo/AlarmConfigChildVo.java | 18 +++++ .../hzims/alarm/config/vo/AlarmConfigSourceVo.java | 19 +++++ .../hnac/hzims/alarm/config/vo/AlarmConfigVo.java | 16 ++++ .../hnac/hzims/alarm/config/vo/AlarmCountVo.java | 27 +++++++ .../hzims/alarm/config/vo/AlarmHandleMarkVo.java | 35 ++++++++ .../hnac/hzims/alarm/config/vo/AlarmHandleVo.java | 55 +++++++++++++ .../hzims/alarm/config/vo/ChildAlarmCountVo.java | 21 +++++ .../hzims/alarm/config/vo/ConditionAlarmVo.java | 58 +++++++++++++ .../com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java | 66 +++++++++++++++ .../hnac/hzims/alarm/config/vo/LevelMessageVo.java | 20 +++++ .../com/hnac/hzims/alarm/config/vo/LevelVo.java | 38 +++++++++ .../hnac/hzims/alarm/config/vo/SystemAlarmVo.java | 46 +++++++++++ .../hnac/hzims/alarm/constants/AlarmConstants.java | 63 --------------- .../hzims/alarm/constants/AlarmHandleConstant.java | 64 --------------- .../alarm/entity/AlarmConfigDetailEntity.java | 62 -------------- .../hnac/hzims/alarm/entity/AlarmConfigEntity.java | 27 ------- .../com/hnac/hzims/alarm/entity/AlarmEntity.java | 94 ---------------------- .../alarm/entity/AlarmHandleDetailEntity.java | 38 --------- .../hnac/hzims/alarm/entity/AlarmHandleEntity.java | 45 ----------- .../hzims/alarm/entity/AlarmHistoryEntity.java | 20 ----- .../hzims/alarm/tabulate/vo/TabulateEarlyVo.java | 20 +++++ .../hnac/hzims/alarm/vo/AlarmConfigChildVo.java | 19 ----- .../hnac/hzims/alarm/vo/AlarmConfigSourceVo.java | 19 ----- .../com/hnac/hzims/alarm/vo/AlarmConfigVo.java | 16 ---- .../java/com/hnac/hzims/alarm/vo/AlarmCountVo.java | 27 ------- .../com/hnac/hzims/alarm/vo/AlarmHandleMarkVo.java | 35 -------- .../com/hnac/hzims/alarm/vo/AlarmHandleVo.java | 55 ------------- .../com/hnac/hzims/alarm/vo/ChildAlarmCountVo.java | 21 ----- .../com/hnac/hzims/alarm/vo/ConditionAlarmVo.java | 58 ------------- .../java/com/hnac/hzims/alarm/vo/FdpAlarmVo.java | 66 --------------- .../com/hnac/hzims/alarm/vo/LevelMessageVo.java | 20 ----- .../main/java/com/hnac/hzims/alarm/vo/LevelVo.java | 38 --------- .../com/hnac/hzims/alarm/vo/SystemAlarmVo.java | 46 ----------- .../com/hnac/hzims/alarm/AlarmApplication.java | 2 +- .../config/controller/AlarmConfigController.java | 5 +- .../controller/AlarmConfigDetailController.java | 4 +- .../config/mapper/AlarmConfigDetailMapper.java | 2 +- .../config/mapper/AlarmConfigDetailMapper.xml | 2 +- .../alarm/config/mapper/AlarmConfigMapper.java | 2 +- .../config/service/AlarmConfigDetailService.java | 9 +-- .../alarm/config/service/AlarmConfigService.java | 6 +- .../service/impl/AlarmConfigDetailServiceImpl.java | 15 ++-- .../service/impl/AlarmConfigServiceImpl.java | 11 ++- .../alarm/config/weapper/AlarmConfigWrapper.java | 4 +- .../monitor/controller/AlarmTestController.java | 2 +- .../alarm/monitor/listener/AlarmListener.java | 2 +- .../alarm/monitor/service/AlarmSaveService.java | 2 +- .../monitor/service/impl/AlarmSaveServiceImpl.java | 7 +- .../hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java | 2 +- .../com/hnac/hzims/alarm/mqtt/FdpMqttConsumer.java | 2 +- .../hnac/hzims/alarm/mqtt/HZ300MqttConsumer.java | 2 +- .../hnac/hzims/alarm/mqtt/VideoMqttConsumer.java | 2 +- .../show/controller/AlarmHandleController.java | 2 +- .../alarm/show/controller/ShowAlarmController.java | 4 +- .../alarm/show/mapper/AlarmHandleDetailMapper.java | 2 +- .../hzims/alarm/show/mapper/AlarmHandleMapper.java | 4 +- .../hzims/alarm/show/mapper/AlarmHandleMapper.xml | 2 +- .../hnac/hzims/alarm/show/mapper/AlarmMapper.java | 2 +- .../show/service/AlarmHandleDetailService.java | 2 +- .../alarm/show/service/AlarmHandleService.java | 4 +- .../hzims/alarm/show/service/AlarmService.java | 4 +- .../service/impl/AlarmHandleDetailServiceImpl.java | 2 +- .../show/service/impl/AlarmHandleServiceImpl.java | 12 +-- .../alarm/show/service/impl/AlarmServiceImpl.java | 8 +- .../hzims/alarm/show/wrapper/HandleWrapper.java | 2 +- .../alarm/source/mapper/AlarmHistoryMapper.java | 2 +- .../alarm/source/service/AlarmHistoryService.java | 2 +- .../alarm/source/service/DroolsAlarmService.java | 2 +- .../alarm/source/service/FdpAlarmService.java | 2 +- .../alarm/source/service/LevelAlarmService.java | 2 +- .../hzims/alarm/source/service/MessageService.java | 2 +- .../alarm/source/service/SystemAlarmService.java | 2 +- .../alarm/source/service/VideoAlarmService.java | 2 +- .../service/impl/AlarmHistoryServiceImpl.java | 2 +- .../service/impl/DroolsAlarmServiceImpl.java | 8 +- .../source/service/impl/FdpAlarmServiceImpl.java | 8 +- .../source/service/impl/LevelAlarmServiceImpl.java | 8 +- .../source/service/impl/MessageServiceImpl.java | 2 +- .../service/impl/SystemAlarmServiceImpl.java | 8 +- .../source/service/impl/VideoAlarmServiceImpl.java | 6 +- .../controller/AlarmTabulateController.java | 37 +++++++++ .../tabulate/service/AlarmTabulateService.java | 15 ++++ .../service/impl/AlarmTabulateServiceImpl.java | 55 +++++++++++++ .../hnac/hzims/alarm/task/VideoScheduledTask.java | 2 +- .../hzims/alarm/ws/level/LevelAlarmWebSocket.java | 2 +- .../scheduled/mapper/alarm/AlarmQueryMapper.java | 2 +- .../scheduled/service/alarm/AlarmQueryService.java | 2 +- .../service/alarm/impl/AlarmQueryServiceImpl.java | 5 +- 96 files changed, 1053 insertions(+), 943 deletions(-) create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmHandleConstant.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigDetailEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleDetailEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHistoryEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigChildVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigSourceVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmCountVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleMarkVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ChildAlarmCountVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ConditionAlarmVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelMessageVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelVo.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/SystemAlarmVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmConstants.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmHandleConstant.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigDetailEntity.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmEntity.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleDetailEntity.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleEntity.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHistoryEntity.java create mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/tabulate/vo/TabulateEarlyVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigChildVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigSourceVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmCountVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleMarkVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ChildAlarmCountVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ConditionAlarmVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/FdpAlarmVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelMessageVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelVo.java delete mode 100644 hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/SystemAlarmVo.java create mode 100644 hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/controller/AlarmTabulateController.java create mode 100644 hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/AlarmTabulateService.java create mode 100644 hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java new file mode 100644 index 0000000..8d08441 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmConstants.java @@ -0,0 +1,63 @@ +package com.hnac.hzims.alarm.config.constants; + +import java.util.Arrays; +import java.util.List; + +/** + * @author ysj + */ +public interface AlarmConstants { + + String APP_NAME = "hzims-alarm-ysj"; + + // 1-集中监控右侧列表 + Integer IS_RIGHT_TABULATION = 1; + // 2-集中监控弹窗 + Integer IS_SHOW_ALERT = 2; + // 3-集中监控铃铛 + Integer IS_SMALL_BELL = 3; + // 4-集中监控遮罩 + Integer IS_MASK = 4; + // 5-语音播报 + Integer IS_BROADCAST = 5; + // 6-WEB/APP消息推送 + Integer IS_PLATFORM_MESSAGE = 6; + // 7-短信推送 + Integer IS_SHORT_MESSAGE = 7; + // 8-微信公众号消息推送 + Integer IS_WX_MESSAGE = 8; + + + // 告警来源 : 0- HZ3000告警 1 -等级告警 2 -条件告警 3-FDP智能预警 4-视频预警 5-开关机告警 + Integer HZ3000_ALARM = 0; + Integer LEVEL_ALARM = 1; + Integer CONDITION_ALARM = 2; + Integer EARLY_WARNING = 3; + Integer VIDEO_WARNING = 4; + Integer START_STOP_WARNING = 5; + List ALARAM_SOURCE = Arrays.asList(HZ3000_ALARM,LEVEL_ALARM,CONDITION_ALARM,EARLY_WARNING,VIDEO_WARNING,START_STOP_WARNING); + + // 子类告警 + // HZ3000告警 : 2-告警 3-故障 5-遥测越限 13-通讯中断 14-数据异常 + // 等级告警 : 21-一级告警 22-二级告警 23-三级告警 + // 智能预警 : 30-智能预警 + // 条件告警 : 40-条件告警 + // 开关机告警 : 50-开机告警 51-关机告警 + Integer WARNING = 2; + Integer FAULT = 3; + Integer OFFSIDE = 5; + Integer INTERRUPT = 13; + Integer ABNORMAL = 14; + List HZ3000_ALARAM_LIST = Arrays.asList(WARNING,FAULT,OFFSIDE,INTERRUPT,ABNORMAL); + Integer ONE_LEVEL = 21; + Integer TWO_LEVEL = 22; + Integer THREE_LEVEL = 23; + List LEVEL_ALARAM = Arrays.asList(ONE_LEVEL,TWO_LEVEL,THREE_LEVEL); + Integer EARLY = 30; + Integer CONDITION = 40; + Integer VIDEO = 50; + Integer START = 60; + Integer STOP = 61; + List START_STOP_ALARAM = Arrays.asList(START,STOP); + String VIDEO_SCHEDULED_TASK= "VideoScheduledTask"; +} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmHandleConstant.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmHandleConstant.java new file mode 100644 index 0000000..ef59136 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/constants/AlarmHandleConstant.java @@ -0,0 +1,64 @@ +package com.hnac.hzims.alarm.config.constants; + +import java.util.Arrays; +import java.util.List; + +/** + * @author YSJ + */ +public interface AlarmHandleConstant { + + List INTERRUPT_LIST = Arrays.asList("13","14"); + + List TYPE_LIST = Arrays.asList("3","2","5","10","13","14"); + + List LONG_TYPE_LIST = Arrays.asList(3L,2L,5L,10L,13L,14L); + + List SEND_MESSSAGE_TYPE_LIST = Arrays.asList("3","13","14"); + + String LEVEL_TYPE_LIST = "3,2,5,10,13,14"; + String SYSTEM_TYPE_LIST = "3,2,5,13,14"; + + /**通讯恢复*/ + String ABNORMAL_STATUS = "1"; + + /**故障**/ + String FAULT = "3"; + + /**预警**/ + Long EARLY_WARNING = 20L; + + String WEBSOCKET_FAULT = "3"; + + String[] TYPE_NAMES = {"默认", "系统", "告警" + , "故障", "用户操作", "遥测越限", "遥信变位", "注册信息", "信息提示", "设备巡检", "遥控操作", "遥测越限恢复","未定义","通讯中断","数据异常"}; + + /**误报 、延后、缺陷 、检修、处理*/ + List HANDLE_WAY = Arrays.asList(1L,2L,3L,4L,5L); + + List HANDLE = Arrays.asList(3L,4L,5L); + + /** + * 2-告警,3-故障,5-遥测越限,13-通讯异常,14-数据异常 + */ + List SOE_TYPE_LIST = Arrays.asList(2,3,5,13,14); + + /** + * 告警等级: 0 - 1级告警 1-二级告警 + */ + List LEVEL_LIST = Arrays.asList("0","1"); + + /** + * 告警类型: HZ3000告警 + */ + Integer SYSTEM_ALARM = 0; + + /** + * 告警类型: 智能告警 + */ + Integer INTELLIGENCE_ALARM = 1; + /** + * 告警类型: 视频告警 + */ + Integer VIDEO_ALARM = 4; +} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigDetailEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigDetailEntity.java new file mode 100644 index 0000000..d483b8f --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigDetailEntity.java @@ -0,0 +1,62 @@ +package com.hnac.hzims.alarm.config.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * @author ysj + */ +@Data +@TableName("hzims_alarm_config_detail") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "站点告警配置详情对象", description = "站点告警配置详情对象") +public class AlarmConfigDetailEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "告警配置ID") + private Long strategyId; + + @ApiModelProperty(value = "告警大类") + private Integer alarmType; + + @ApiModelProperty(value = "告警子类") + private Integer alarmChiledType; + + @ApiModelProperty(value = "告警内容") + private String alarmContext; + + @ApiModelProperty(value = "告警监测点") + private String alarmPoint; + + @ApiModelProperty(value = "是否集中监控右侧列表展示 : 0-展示 1-不展示") + private Integer isRightTabulation; + + @ApiModelProperty(value = "是否集中监控弹窗展示 : 0-展示 1-不展示") + private Integer isShowAlert; + + @ApiModelProperty(value = "是否集中监控铃铛展示 : 0-展示 1-不展示") + private Integer isSmallBell; + + @ApiModelProperty(value = "是否集中监控遮罩展示 : 0-展示 1-不展示") + private Integer isMask; + + @ApiModelProperty(value = "是否语音播报 : 0-播报 1-不播报") + private Integer isBroadcast; + + @ApiModelProperty(value = "是否进行平台消息推送 : 0-推送 1-不推送") + private Integer isPlatformMessage; + + @ApiModelProperty(value = "是否短信推送 ：0-推送 1-不推送") + private Integer isShortMessage; + + @ApiModelProperty(value = "是否微信公众号消息推送 ：0-推送 1-不推送") + private Integer isWxMessage; +} + diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigEntity.java new file mode 100644 index 0000000..264928f --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmConfigEntity.java @@ -0,0 +1,27 @@ +package com.hnac.hzims.alarm.config.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * @author ysj + */ +@Data +@TableName("hzims_alarm_config") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "告警配置对象", description = "告警配置") +public class AlarmConfigEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "站点编号") + private String stationId; + + @ApiModelProperty(value = "站点名称") + private String stationName; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmEntity.java new file mode 100644 index 0000000..24442c8 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmEntity.java @@ -0,0 +1,94 @@ +package com.hnac.hzims.alarm.config.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.io.Serializable; +import java.util.Date; + + +/** + * @author ysj + */ +@Data +@TableName("hzims_alarm") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "告警对象", description = "各告警数据源保存对象") +public class AlarmEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "站点编号") + private String stationId; + + @ApiModelProperty(value = "站点名称") + private String stationName; + + @ApiModelProperty(value = "设备编码") + private String deviceCode; + + @ApiModelProperty(value = "设备名称") + private String deviceName; + + @ApiModelProperty(value = "告警ID") + private String alarmId; + + @ApiModelProperty(value = "告警类型 ：0- HZ3000告警 1 -等级告警 2 -条件告警 3-FDP智能预警 4-视频预警 5-开关机告警") + private Integer alarmSource; + + @ApiModelProperty(value = "告警子类") + private Integer alarmType; + + @ApiModelProperty(value = "告警属性标识") + private String alarmSignage; + + @ApiModelProperty(value = "告警内容") + private String alarmContext; + + @ApiModelProperty(value = "告警状态") + private Integer alarmStatus; + + @ApiModelProperty(value = "告警等级") + private Integer alarmLevel; + + @ApiModelProperty(value = "告警动作数值") + private String alarmValue; + + @ApiModelProperty(value = "告警数量") + private Integer alarmCount; + + @ApiModelProperty(value = "告警时间") + private Date alarmTime; + + @ApiModelProperty(value = "监测点") + private String realId; + + @ApiModelProperty(value = "是否集中监控右侧列表展示 : 0-展示 1-不展示") + private Integer isRightTabulation; + + @ApiModelProperty(value = "是否集中监控弹窗展示 : 0-展示 1-不展示") + private Integer isShowAlert; + + @ApiModelProperty(value = "是否集中监控铃铛展示 : 0-展示 1-不展示") + private Integer isSmallBell; + + @ApiModelProperty(value = "是否集中监控遮罩展示 : 0-展示 1-不展示") + private Integer isMask; + + @ApiModelProperty(value = "是否语音播报 : 0-播报 1-不播报") + private Integer isBroadcast; + + @ApiModelProperty(value = "是否进行平台消息推送 : 0-推送 1-不推送") + private Integer isPlatformMessage; + + @ApiModelProperty(value = "是否短信推送 ：0-推送 1-不推送") + private Integer isShortMessage; + + @ApiModelProperty(value = "是否微信公众号消息推送 ：0-推送 1-不推送") + private Integer isWxMessage; + +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleDetailEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleDetailEntity.java new file mode 100644 index 0000000..1db4311 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleDetailEntity.java @@ -0,0 +1,38 @@ +package com.hnac.hzims.alarm.config.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +@Data +@TableName("hzims_alarm_handle_detail") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "告警处理详情对象") +public class AlarmHandleDetailEntity extends BaseEntity { + + @ApiModelProperty("通知处理人") + private Long handleUser; + + @ApiModelProperty("现象ID") + private Long phenomenonId; + + @ApiModelProperty("检修ID") + private Long accessId; + + @ApiModelProperty("延后时间") + private Date delayTime; + + @ApiModelProperty("延后原因") + private String delayCause; + + @ApiModelProperty("误报描述") + private String falseAlarmDesc; + + @ApiModelProperty("附件路径") + private String filePath; +} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleEntity.java new file mode 100644 index 0000000..6bcdb09 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleEntity.java @@ -0,0 +1,45 @@ +package com.hnac.hzims.alarm.config.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +/** + * @author ysj + */ +@Data +@TableName("hzims_alarm_handle") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "告警处理对象") +public class AlarmHandleEntity extends BaseEntity { + + @ApiModelProperty("告警Id") + private String alarmId; + + @ApiModelProperty("站点编码") + private String stationCode; + + @ApiModelProperty("告警类型") + private Long alarmType; + + @ApiModelProperty("告警所属类型:0-系统告警 1-智能告警") + private Integer type; + + @ApiModelProperty("告警时间") + private Date alarmTime; + + @ApiModelProperty("告警内容") + private String alarmContent; + + @ApiModelProperty("处理方式") + private Long handleWay; + + @ApiModelProperty("处理详情ID") + private Long detailId; +} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHistoryEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHistoryEntity.java new file mode 100644 index 0000000..fd4589c --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHistoryEntity.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.alarm.config.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * @author ysj + */ +@Data +@TableName("hzims_alarm_history") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "告警对象", description = "各告警数据源保存对象") +public class AlarmHistoryEntity extends AlarmEntity { + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigChildVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigChildVo.java new file mode 100644 index 0000000..8c59a14 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigChildVo.java @@ -0,0 +1,18 @@ +package com.hnac.hzims.alarm.config.vo; + +import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class AlarmConfigChildVo { + + @ApiModelProperty(value = "告警类型") + private Integer type; + + @ApiModelProperty(value = "告警类型") + private AlarmConfigDetailEntity detail; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigSourceVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigSourceVo.java new file mode 100644 index 0000000..807afac --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigSourceVo.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +public class AlarmConfigSourceVo { + + @ApiModelProperty(value = "告警来源") + private Integer source; + + @ApiModelProperty(value = "告警子类") + private List childs; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigVo.java new file mode 100644 index 0000000..130066d --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmConfigVo.java @@ -0,0 +1,16 @@ +package com.hnac.hzims.alarm.config.vo; + +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class AlarmConfigVo extends AlarmConfigEntity { + + @ApiModelProperty(value = "用户名称") + private String userName; + +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmCountVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmCountVo.java new file mode 100644 index 0000000..4960d82 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmCountVo.java @@ -0,0 +1,27 @@ +package com.hnac.hzims.alarm.config.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +public class AlarmCountVo { + + @ApiModelProperty(value = "告警类型") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Integer type; + + @ApiModelProperty(value = "告警条目数量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long count; + + @ApiModelProperty(value = "子类告警数量集合") + @JsonSerialize(nullsUsing = NullSerializer.class) + private List childs; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleMarkVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleMarkVo.java new file mode 100644 index 0000000..e299101 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleMarkVo.java @@ -0,0 +1,35 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class AlarmHandleMarkVo { + + @ApiModelProperty(value = "是否集中监控右侧列表展示 : 0-展示 1-不展示") + private Integer isRightTabulation; + + @ApiModelProperty(value = "是否集中监控弹窗展示 : 0-展示 1-不展示") + private Integer isShowAlert; + + @ApiModelProperty(value = "是否集中监控铃铛展示 : 0-展示 1-不展示") + private Integer isSmallBell; + + @ApiModelProperty(value = "是否集中监控遮罩展示 : 0-展示 1-不展示") + private Integer isMask; + + @ApiModelProperty(value = "是否语音播报 : 0-播报 1-不播报") + private Integer isBroadcast; + + @ApiModelProperty(value = "是否进行平台消息推送 : 0-推送 1-不推送") + private Integer isPlatformMessage; + + @ApiModelProperty(value = "是否短信推送 ：0-推送 1-不推送") + private Integer isShortMessage; + + @ApiModelProperty(value = "是否微信公众号消息推送 ：0-推送 1-不推送") + private Integer isWxMessage; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleVo.java new file mode 100644 index 0000000..2dca453 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/AlarmHandleVo.java @@ -0,0 +1,55 @@ +package com.hnac.hzims.alarm.config.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * @author ysj + * @date 2023/03/17 10:02:33 + * @version 4.0.0 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class AlarmHandleVo extends AlarmHandleEntity { + + @ApiModelProperty("站点名称") + private String stationName; + + @ApiModelProperty("延后处理时间") + private Date delayTime; + + @ApiModelProperty("延后处理时间") + private String delayCause; + + @ApiModelProperty("误报描述") + private String falseAlarmDesc; + + @ApiModelProperty("附件路径") + private String filePath; + + @ApiModelProperty("通知处理人") + private Long handleUser; + + @ApiModelProperty("现象Id") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long phenomenonId; + + @ApiModelProperty("现象流程Id") + private String checkProcessInstanceId; + + @ApiModelProperty("检修ID") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long accessId; + + @ApiModelProperty("检修流程Id") + private String processInstanceId; + + @ApiModelProperty("用户名称") + private String userName; +} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ChildAlarmCountVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ChildAlarmCountVo.java new file mode 100644 index 0000000..98a15b9 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ChildAlarmCountVo.java @@ -0,0 +1,21 @@ +package com.hnac.hzims.alarm.config.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class ChildAlarmCountVo { + + @ApiModelProperty(value = "告警子类") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Integer type; + + @ApiModelProperty(value = "告警条目数量") + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long count; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ConditionAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ConditionAlarmVo.java new file mode 100644 index 0000000..eb41e82 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/ConditionAlarmVo.java @@ -0,0 +1,58 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; + + +/** + * @author ty + */ +@Data +@ApiModel(value = "条件预警对象", description = "条件预警对象") +public class ConditionAlarmVo { + //todo + + private static final long serialVersionUID = 1L; + /** + * 故障ID + */ + private String faultId; + /** + * 故障站点 + */ + private String station; + /** + * 故障名称 + */ + private String name; + /** + * 位置 + */ + private String ord; + /** + * 故障状态 + */ + private Float status; + /** + * 故障的附属信息 + */ + private String info; + /** + * 报警类型 + */ + private String ftype; + /** + * 报警内容 + */ + private String finfo; + /** + * 报警内容 + */ + private Object[] children; + /** + * 创建时间 + */ + private Date createTime; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java new file mode 100644 index 0000000..e7b3d9f --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java @@ -0,0 +1,66 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; + + +/** + * @author ty + */ +@Data +@ApiModel(value = "fdp智能预警对象", description = "fdp智能预警对象") +public class FdpAlarmVo { + + private static final long serialVersionUID = 1L; + /** + * 故障ID + */ + private String faultId; + /** + * 故障站点 + */ + private String station; + /** + * 故障状态 + */ + private String status; + /** + * 故障名称 + */ + private String name; + /** + * 位置 + */ + private String ord; + + /** + * 故障的附属信息 + */ + private String info; + /** + * 报警类型 + */ + private String ftype; + /** + * 报警内容 + */ + private String finfo; + /** + * 内容 + */ + private String content; + /** + * 设备名称 + */ + private String deviceName; +// /** +// * 报警内容 +// */ +// private Object[] children; + /** + * 创建时间 + */ + private Date createTime; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelMessageVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelMessageVo.java new file mode 100644 index 0000000..f8d8caa --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelMessageVo.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class LevelMessageVo { + + @ApiModelProperty(value = "站点编码:用逗号分隔") + private String projectIds; + + @ApiModelProperty(value = "类型") + private String type; + + @ApiModelProperty(value = "开始时间") + private String startTime; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelVo.java new file mode 100644 index 0000000..82b9cc4 --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/LevelVo.java @@ -0,0 +1,38 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +public class LevelVo { + + @ApiModelProperty(value = "告警Id") + private String id; + + @ApiModelProperty(value = "告警时间") + private String ts; + + @ApiModelProperty(value = "设备编码") + private String devicecode; + + @ApiModelProperty(value = "设备名称") + private String devicename; + + @ApiModelProperty(value = "告警内容") + private String name; + + @ApiModelProperty(value = "告警类型") + private Integer type; + + @ApiModelProperty(value = "告警等级") + private Integer level; + + @ApiModelProperty(value = "告警发生时，设备实时数据") + private String context; + + @ApiModelProperty(value = "事件标识") + private String signage; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/SystemAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/SystemAlarmVo.java new file mode 100644 index 0000000..833d0ef --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/SystemAlarmVo.java @@ -0,0 +1,46 @@ +package com.hnac.hzims.alarm.config.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + + +/** + * @author ysj + */ +@Data +@ApiModel(value = "华自3000告警对象", description = "华自3000告警对象") +public class SystemAlarmVo { + + private static final long serialVersionUID = 1L; + + /** + * 告警时间 + */ + private String ts; + /** + * 告警ID，由平台生成，具有唯一性 + */ + private String id; + /** + * 告警内容 + */ + private String soeExplain; + /** + * 告警类型，对应数据字典 soe_alarm_type + */ + private Integer soeType; + private Integer soeStatus; + /** + * 告警动作，对应HZ3000的告警，如 {"分", "合"}, {"复归", "动作"} + */ + private Integer soeAlarmType; + /** + * 动作值 + */ + private String optionvals; + /** + * 站点id + */ + private String station; + +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmConstants.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmConstants.java deleted file mode 100644 index 2c1c2cc..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmConstants.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hnac.hzims.alarm.constants; - -import java.util.Arrays; -import java.util.List; - -/** - * @author ysj - */ -public interface AlarmConstants { - - String APP_NAME = "hzims-alarm"; - - // 1-集中监控右侧列表 - Integer IS_RIGHT_TABULATION = 1; - // 2-集中监控弹窗 - Integer IS_SHOW_ALERT = 2; - // 3-集中监控铃铛 - Integer IS_SMALL_BELL = 3; - // 4-集中监控遮罩 - Integer IS_MASK = 4; - // 5-语音播报 - Integer IS_BROADCAST = 5; - // 6-WEB/APP消息推送 - Integer IS_PLATFORM_MESSAGE = 6; - // 7-短信推送 - Integer IS_SHORT_MESSAGE = 7; - // 8-微信公众号消息推送 - Integer IS_WX_MESSAGE = 8; - - - // 告警来源 : 0- HZ3000告警 1 -等级告警 2 -条件告警 3-FDP智能预警 4-视频预警 5-开关机告警 - Integer HZ3000_ALARM = 0; - Integer LEVEL_ALARM = 1; - Integer CONDITION_ALARM = 2; - Integer EARLY_WARNING = 3; - Integer VIDEO_WARNING = 4; - Integer START_STOP_WARNING = 5; - List ALARAM_SOURCE = Arrays.asList(HZ3000_ALARM,LEVEL_ALARM,CONDITION_ALARM,EARLY_WARNING,VIDEO_WARNING,START_STOP_WARNING); - - // 子类告警 - // HZ3000告警 : 2-告警 3-故障 5-遥测越限 13-通讯中断 14-数据异常 - // 等级告警 : 21-一级告警 22-二级告警 23-三级告警 - // 智能预警 : 30-智能预警 - // 条件告警 : 40-条件告警 - // 开关机告警 : 50-开机告警 51-关机告警 - Integer WARNING = 2; - Integer FAULT = 3; - Integer OFFSIDE = 5; - Integer INTERRUPT = 13; - Integer ABNORMAL = 14; - List HZ3000_ALARAM_LIST = Arrays.asList(WARNING,FAULT,OFFSIDE,INTERRUPT,ABNORMAL); - Integer ONE_LEVEL = 21; - Integer TWO_LEVEL = 22; - Integer THREE_LEVEL = 23; - List LEVEL_ALARAM = Arrays.asList(ONE_LEVEL,TWO_LEVEL,THREE_LEVEL); - Integer EARLY = 30; - Integer CONDITION = 40; - Integer VIDEO = 50; - Integer START = 60; - Integer STOP = 61; - List START_STOP_ALARAM = Arrays.asList(START,STOP); - String VIDEO_SCHEDULED_TASK= "VideoScheduledTask"; -} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmHandleConstant.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmHandleConstant.java deleted file mode 100644 index 8804bc0..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/constants/AlarmHandleConstant.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hnac.hzims.alarm.constants; - -import java.util.Arrays; -import java.util.List; - -/** - * @author YSJ - */ -public interface AlarmHandleConstant { - - List INTERRUPT_LIST = Arrays.asList("13","14"); - - List TYPE_LIST = Arrays.asList("3","2","5","10","13","14"); - - List LONG_TYPE_LIST = Arrays.asList(3L,2L,5L,10L,13L,14L); - - List SEND_MESSSAGE_TYPE_LIST = Arrays.asList("3","13","14"); - - String LEVEL_TYPE_LIST = "3,2,5,10,13,14"; - String SYSTEM_TYPE_LIST = "3,2,5,13,14"; - - /**通讯恢复*/ - String ABNORMAL_STATUS = "1"; - - /**故障**/ - String FAULT = "3"; - - /**预警**/ - Long EARLY_WARNING = 20L; - - String WEBSOCKET_FAULT = "3"; - - String[] TYPE_NAMES = {"默认", "系统", "告警" - , "故障", "用户操作", "遥测越限", "遥信变位", "注册信息", "信息提示", "设备巡检", "遥控操作", "遥测越限恢复","未定义","通讯中断","数据异常"}; - - /**误报 、延后、缺陷 、检修、处理*/ - List HANDLE_WAY = Arrays.asList(1L,2L,3L,4L,5L); - - List HANDLE = Arrays.asList(3L,4L,5L); - - /** - * 2-告警,3-故障,5-遥测越限,13-通讯异常,14-数据异常 - */ - List SOE_TYPE_LIST = Arrays.asList(2,3,5,13,14); - - /** - * 告警等级: 0 - 1级告警 1-二级告警 - */ - List LEVEL_LIST = Arrays.asList("0","1"); - - /** - * 告警类型: HZ3000告警 - */ - Integer SYSTEM_ALARM = 0; - - /** - * 告警类型: 智能告警 - */ - Integer INTELLIGENCE_ALARM = 1; - /** - * 告警类型: 视频告警 - */ - Integer VIDEO_ALARM = 4; -} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigDetailEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigDetailEntity.java deleted file mode 100644 index 8f7bc65..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigDetailEntity.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hnac.hzims.alarm.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - - -/** - * @author ysj - */ -@Data -@TableName("hzims_alarm_config_detail") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "站点告警配置详情对象", description = "站点告警配置详情对象") -public class AlarmConfigDetailEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "告警配置ID") - private Long strategyId; - - @ApiModelProperty(value = "告警大类") - private Integer alarmType; - - @ApiModelProperty(value = "告警子类") - private Integer alarmChiledType; - - @ApiModelProperty(value = "告警内容") - private String alarmContext; - - @ApiModelProperty(value = "告警监测点") - private String alarmPoint; - - @ApiModelProperty(value = "是否集中监控右侧列表展示 : 0-展示 1-不展示") - private Integer isRightTabulation; - - @ApiModelProperty(value = "是否集中监控弹窗展示 : 0-展示 1-不展示") - private Integer isShowAlert; - - @ApiModelProperty(value = "是否集中监控铃铛展示 : 0-展示 1-不展示") - private Integer isSmallBell; - - @ApiModelProperty(value = "是否集中监控遮罩展示 : 0-展示 1-不展示") - private Integer isMask; - - @ApiModelProperty(value = "是否语音播报 : 0-播报 1-不播报") - private Integer isBroadcast; - - @ApiModelProperty(value = "是否进行平台消息推送 : 0-推送 1-不推送") - private Integer isPlatformMessage; - - @ApiModelProperty(value = "是否短信推送 ：0-推送 1-不推送") - private Integer isShortMessage; - - @ApiModelProperty(value = "是否微信公众号消息推送 ：0-推送 1-不推送") - private Integer isWxMessage; -} - diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java deleted file mode 100644 index bf85187..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.alarm.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - - -/** - * @author ysj - */ -@Data -@TableName("hzims_alarm_config") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "告警配置对象", description = "告警配置") -public class AlarmConfigEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "站点编号") - private String stationId; - - @ApiModelProperty(value = "站点名称") - private String stationName; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmEntity.java deleted file mode 100644 index c3abfbf..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmEntity.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hnac.hzims.alarm.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - -import java.io.Serializable; -import java.util.Date; - - -/** - * @author ysj - */ -@Data -@TableName("hzims_alarm") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "告警对象", description = "各告警数据源保存对象") -public class AlarmEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "站点编号") - private String stationId; - - @ApiModelProperty(value = "站点名称") - private String stationName; - - @ApiModelProperty(value = "设备编码") - private String deviceCode; - - @ApiModelProperty(value = "设备名称") - private String deviceName; - - @ApiModelProperty(value = "告警ID") - private String alarmId; - - @ApiModelProperty(value = "告警类型 ：0- HZ3000告警 1 -等级告警 2 -条件告警 3-FDP智能预警 4-视频预警 5-开关机告警") - private Integer alarmSource; - - @ApiModelProperty(value = "告警子类") - private Integer alarmType; - - @ApiModelProperty(value = "告警属性标识") - private String alarmSignage; - - @ApiModelProperty(value = "告警内容") - private String alarmContext; - - @ApiModelProperty(value = "告警状态") - private Integer alarmStatus; - - @ApiModelProperty(value = "告警等级") - private Integer alarmLevel; - - @ApiModelProperty(value = "告警动作数值") - private String alarmValue; - - @ApiModelProperty(value = "告警数量") - private Integer alarmCount; - - @ApiModelProperty(value = "告警时间") - private Date alarmTime; - - @ApiModelProperty(value = "监测点") - private String realId; - - @ApiModelProperty(value = "是否集中监控右侧列表展示 : 0-展示 1-不展示") - private Integer isRightTabulation; - - @ApiModelProperty(value = "是否集中监控弹窗展示 : 0-展示 1-不展示") - private Integer isShowAlert; - - @ApiModelProperty(value = "是否集中监控铃铛展示 : 0-展示 1-不展示") - private Integer isSmallBell; - - @ApiModelProperty(value = "是否集中监控遮罩展示 : 0-展示 1-不展示") - private Integer isMask; - - @ApiModelProperty(value = "是否语音播报 : 0-播报 1-不播报") - private Integer isBroadcast; - - @ApiModelProperty(value = "是否进行平台消息推送 : 0-推送 1-不推送") - private Integer isPlatformMessage; - - @ApiModelProperty(value = "是否短信推送 ：0-推送 1-不推送") - private Integer isShortMessage; - - @ApiModelProperty(value = "是否微信公众号消息推送 ：0-推送 1-不推送") - private Integer isWxMessage; - -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleDetailEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleDetailEntity.java deleted file mode 100644 index 5f68cad..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleDetailEntity.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hnac.hzims.alarm.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; - -import java.util.Date; - -@Data -@TableName("hzims_alarm_handle_detail") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "告警处理详情对象") -public class AlarmHandleDetailEntity extends BaseEntity { - - @ApiModelProperty("通知处理人") - private Long handleUser; - - @ApiModelProperty("现象ID") - private Long phenomenonId; - - @ApiModelProperty("检修ID") - private Long accessId; - - @ApiModelProperty("延后时间") - private Date delayTime; - - @ApiModelProperty("延后原因") - private String delayCause; - - @ApiModelProperty("误报描述") - private String falseAlarmDesc; - - @ApiModelProperty("附件路径") - private String filePath; -} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleEntity.java deleted file mode 100644 index 23e6a46..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHandleEntity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hnac.hzims.alarm.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; - -import java.util.Date; - -/** - * @author ysj - */ -@Data -@TableName("hzims_alarm_handle") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "告警处理对象") -public class AlarmHandleEntity extends BaseEntity { - - @ApiModelProperty("告警Id") - private String alarmId; - - @ApiModelProperty("站点编码") - private String stationCode; - - @ApiModelProperty("告警类型") - private Long alarmType; - - @ApiModelProperty("告警所属类型:0-系统告警 1-智能告警") - private Integer type; - - @ApiModelProperty("告警时间") - private Date alarmTime; - - @ApiModelProperty("告警内容") - private String alarmContent; - - @ApiModelProperty("处理方式") - private Long handleWay; - - @ApiModelProperty("处理详情ID") - private Long detailId; -} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHistoryEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHistoryEntity.java deleted file mode 100644 index a8ed19a..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmHistoryEntity.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hnac.hzims.alarm.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * @author ysj - */ -@Data -@TableName("hzims_alarm_history") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "告警对象", description = "各告警数据源保存对象") -public class AlarmHistoryEntity extends AlarmEntity { - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/tabulate/vo/TabulateEarlyVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/tabulate/vo/TabulateEarlyVo.java new file mode 100644 index 0000000..d58684b --- /dev/null +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/tabulate/vo/TabulateEarlyVo.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.alarm.tabulate.vo; + +import com.hnac.hzims.alarm.config.vo.AlarmConfigChildVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author ysj + */ +@Data +public class TabulateEarlyVo { + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; +} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigChildVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigChildVo.java deleted file mode 100644 index cec0bfb..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigChildVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import com.hnac.hzims.alarm.entity.AlarmConfigDetailEntity; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; - -/** - * @author ysj - */ -@Data -public class AlarmConfigChildVo { - - @ApiModelProperty(value = "告警类型") - private Integer type; - - @ApiModelProperty(value = "告警类型") - private AlarmConfigDetailEntity detail; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigSourceVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigSourceVo.java deleted file mode 100644 index ca11fd6..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigSourceVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -public class AlarmConfigSourceVo { - - @ApiModelProperty(value = "告警来源") - private Integer source; - - @ApiModelProperty(value = "告警子类") - private List childs; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigVo.java deleted file mode 100644 index 67b0aef..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmConfigVo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -public class AlarmConfigVo extends AlarmConfigEntity { - - @ApiModelProperty(value = "用户名称") - private String userName; - -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmCountVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmCountVo.java deleted file mode 100644 index 20cd0e6..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmCountVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -public class AlarmCountVo { - - @ApiModelProperty(value = "告警类型") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Integer type; - - @ApiModelProperty(value = "告警条目数量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Long count; - - @ApiModelProperty(value = "子类告警数量集合") - @JsonSerialize(nullsUsing = NullSerializer.class) - private List childs; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleMarkVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleMarkVo.java deleted file mode 100644 index 9259440..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleMarkVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -public class AlarmHandleMarkVo { - - @ApiModelProperty(value = "是否集中监控右侧列表展示 : 0-展示 1-不展示") - private Integer isRightTabulation; - - @ApiModelProperty(value = "是否集中监控弹窗展示 : 0-展示 1-不展示") - private Integer isShowAlert; - - @ApiModelProperty(value = "是否集中监控铃铛展示 : 0-展示 1-不展示") - private Integer isSmallBell; - - @ApiModelProperty(value = "是否集中监控遮罩展示 : 0-展示 1-不展示") - private Integer isMask; - - @ApiModelProperty(value = "是否语音播报 : 0-播报 1-不播报") - private Integer isBroadcast; - - @ApiModelProperty(value = "是否进行平台消息推送 : 0-推送 1-不推送") - private Integer isPlatformMessage; - - @ApiModelProperty(value = "是否短信推送 ：0-推送 1-不推送") - private Integer isShortMessage; - - @ApiModelProperty(value = "是否微信公众号消息推送 ：0-推送 1-不推送") - private Integer isWxMessage; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleVo.java deleted file mode 100644 index 85f2e35..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/AlarmHandleVo.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import com.hnac.hzims.alarm.entity.AlarmHandleEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * @author ysj - * @date 2023/03/17 10:02:33 - * @version 4.0.0 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class AlarmHandleVo extends AlarmHandleEntity { - - @ApiModelProperty("站点名称") - private String stationName; - - @ApiModelProperty("延后处理时间") - private Date delayTime; - - @ApiModelProperty("延后处理时间") - private String delayCause; - - @ApiModelProperty("误报描述") - private String falseAlarmDesc; - - @ApiModelProperty("附件路径") - private String filePath; - - @ApiModelProperty("通知处理人") - private Long handleUser; - - @ApiModelProperty("现象Id") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Long phenomenonId; - - @ApiModelProperty("现象流程Id") - private String checkProcessInstanceId; - - @ApiModelProperty("检修ID") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Long accessId; - - @ApiModelProperty("检修流程Id") - private String processInstanceId; - - @ApiModelProperty("用户名称") - private String userName; -} diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ChildAlarmCountVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ChildAlarmCountVo.java deleted file mode 100644 index b97e89c..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ChildAlarmCountVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -public class ChildAlarmCountVo { - - @ApiModelProperty(value = "告警子类") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Integer type; - - @ApiModelProperty(value = "告警条目数量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Long count; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ConditionAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ConditionAlarmVo.java deleted file mode 100644 index ed79389..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/ConditionAlarmVo.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.Date; - - -/** - * @author ty - */ -@Data -@ApiModel(value = "条件预警对象", description = "条件预警对象") -public class ConditionAlarmVo { - //todo - - private static final long serialVersionUID = 1L; - /** - * 故障ID - */ - private String faultId; - /** - * 故障站点 - */ - private String station; - /** - * 故障名称 - */ - private String name; - /** - * 位置 - */ - private String ord; - /** - * 故障状态 - */ - private Float status; - /** - * 故障的附属信息 - */ - private String info; - /** - * 报警类型 - */ - private String ftype; - /** - * 报警内容 - */ - private String finfo; - /** - * 报警内容 - */ - private Object[] children; - /** - * 创建时间 - */ - private Date createTime; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/FdpAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/FdpAlarmVo.java deleted file mode 100644 index 196b624..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/FdpAlarmVo.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.Date; - - -/** - * @author ty - */ -@Data -@ApiModel(value = "fdp智能预警对象", description = "fdp智能预警对象") -public class FdpAlarmVo { - - private static final long serialVersionUID = 1L; - /** - * 故障ID - */ - private String faultId; - /** - * 故障站点 - */ - private String station; - /** - * 故障状态 - */ - private String status; - /** - * 故障名称 - */ - private String name; - /** - * 位置 - */ - private String ord; - - /** - * 故障的附属信息 - */ - private String info; - /** - * 报警类型 - */ - private String ftype; - /** - * 报警内容 - */ - private String finfo; - /** - * 内容 - */ - private String content; - /** - * 设备名称 - */ - private String deviceName; -// /** -// * 报警内容 -// */ -// private Object[] children; - /** - * 创建时间 - */ - private Date createTime; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelMessageVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelMessageVo.java deleted file mode 100644 index 6099f55..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelMessageVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -public class LevelMessageVo { - - @ApiModelProperty(value = "站点编码:用逗号分隔") - private String projectIds; - - @ApiModelProperty(value = "类型") - private String type; - - @ApiModelProperty(value = "开始时间") - private String startTime; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelVo.java deleted file mode 100644 index 8170951..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/LevelVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -public class LevelVo { - - @ApiModelProperty(value = "告警Id") - private String id; - - @ApiModelProperty(value = "告警时间") - private String ts; - - @ApiModelProperty(value = "设备编码") - private String devicecode; - - @ApiModelProperty(value = "设备名称") - private String devicename; - - @ApiModelProperty(value = "告警内容") - private String name; - - @ApiModelProperty(value = "告警类型") - private Integer type; - - @ApiModelProperty(value = "告警等级") - private Integer level; - - @ApiModelProperty(value = "告警发生时，设备实时数据") - private String context; - - @ApiModelProperty(value = "事件标识") - private String signage; -} \ No newline at end of file diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/SystemAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/SystemAlarmVo.java deleted file mode 100644 index 35575ca..0000000 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/vo/SystemAlarmVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hnac.hzims.alarm.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - - -/** - * @author ysj - */ -@Data -@ApiModel(value = "华自3000告警对象", description = "华自3000告警对象") -public class SystemAlarmVo { - - private static final long serialVersionUID = 1L; - - /** - * 告警时间 - */ - private String ts; - /** - * 告警ID，由平台生成，具有唯一性 - */ - private String id; - /** - * 告警内容 - */ - private String soeExplain; - /** - * 告警类型，对应数据字典 soe_alarm_type - */ - private Integer soeType; - private Integer soeStatus; - /** - * 告警动作，对应HZ3000的告警，如 {"分", "合"}, {"复归", "动作"} - */ - private Integer soeAlarmType; - /** - * 动作值 - */ - private String optionvals; - /** - * 站点id - */ - private String station; - -} \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/AlarmApplication.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/AlarmApplication.java index a9dd732..9aa90e1 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/AlarmApplication.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/AlarmApplication.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm; -import com.hnac.hzims.alarm.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigController.java index 4dbf5f6..5c76aec 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigController.java @@ -3,8 +3,8 @@ package com.hnac.hzims.alarm.config.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.alarm.config.service.AlarmConfigService; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import com.hnac.hzims.alarm.vo.AlarmConfigVo; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.vo.AlarmConfigVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -15,7 +15,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigDetailController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigDetailController.java index 0af8bd8..d6174ff 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigDetailController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/controller/AlarmConfigDetailController.java @@ -2,8 +2,7 @@ package com.hnac.hzims.alarm.config.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.alarm.config.service.AlarmConfigDetailService; -import com.hnac.hzims.alarm.entity.AlarmConfigDetailEntity; -import com.hnac.hzims.equipment.entity.PlanGenerationEntity; +import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -13,7 +12,6 @@ import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.List; /** * @author ysj diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.java index 1759832..05cb40a 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.alarm.entity.AlarmConfigDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; import org.apache.ibatis.annotations.Param; /** diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.xml index d29dafa..17b109e 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.xml +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigDetailMapper.xml @@ -2,7 +2,7 @@ - SELECT detail.* FROM hzims_alarm_config_detail detail INNER JOIN hzims_alarm_config config ON detail.STRATEGY_ID = config.ID diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigMapper.java index 5742381..c5a53b4 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmConfigMapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java index d66c2b4..29fc7ae 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigDetailService.java @@ -1,11 +1,10 @@ package com.hnac.hzims.alarm.config.service; -import com.hnac.hzims.alarm.entity.AlarmConfigDetailEntity; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import com.hnac.hzims.alarm.vo.AlarmConfigSourceVo; -import com.hnac.hzims.alarm.vo.AlarmHandleMarkVo; +import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.vo.AlarmConfigSourceVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.tool.api.R; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java index 6fc879b..e8810b0 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/AlarmConfigService.java @@ -1,9 +1,9 @@ package com.hnac.hzims.alarm.config.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import com.hnac.hzims.alarm.vo.AlarmConfigVo; -import com.hnac.hzims.alarm.vo.AlarmHandleMarkVo; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.vo.AlarmConfigVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import org.springblade.core.mp.base.BaseService; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java index 7a9c1e4..ba8d184 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigDetailServiceImpl.java @@ -3,21 +3,18 @@ package com.hnac.hzims.alarm.config.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.alarm.config.mapper.AlarmConfigDetailMapper; import com.hnac.hzims.alarm.config.service.AlarmConfigDetailService; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmConfigDetailEntity; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import com.hnac.hzims.alarm.vo.AlarmConfigChildVo; -import com.hnac.hzims.alarm.vo.AlarmConfigSourceVo; -import com.hnac.hzims.alarm.vo.AlarmHandleMarkVo; -import io.swagger.models.auth.In; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.vo.AlarmConfigChildVo; +import com.hnac.hzims.alarm.config.vo.AlarmConfigSourceVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.system.cache.DictCache; -import org.springblade.system.entity.Dict; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java index b2c012a..cdfd798 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java @@ -6,12 +6,11 @@ import com.hnac.hzims.alarm.config.mapper.AlarmConfigMapper; import com.hnac.hzims.alarm.config.service.AlarmConfigDetailService; import com.hnac.hzims.alarm.config.service.AlarmConfigService; import com.hnac.hzims.alarm.config.weapper.AlarmConfigWrapper; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmConfigDetailEntity; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import com.hnac.hzims.alarm.vo.AlarmConfigVo; -import com.hnac.hzims.alarm.vo.AlarmHandleMarkVo; -import io.swagger.models.auth.In; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmConfigDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.vo.AlarmConfigVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/weapper/AlarmConfigWrapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/weapper/AlarmConfigWrapper.java index c0d3be9..8b0cfea 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/weapper/AlarmConfigWrapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/weapper/AlarmConfigWrapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.config.weapper; -import com.hnac.hzims.alarm.entity.AlarmConfigEntity; -import com.hnac.hzims.alarm.vo.AlarmConfigVo; +import com.hnac.hzims.alarm.config.entity.AlarmConfigEntity; +import com.hnac.hzims.alarm.config.vo.AlarmConfigVo; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.system.user.cache.UserCache; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/controller/AlarmTestController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/controller/AlarmTestController.java index 4a79188..1210219 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/controller/AlarmTestController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/controller/AlarmTestController.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.monitor.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java index 3441281..daedb3f 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.monitor.listener; import com.alibaba.fastjson.JSONObject; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.MessageService; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.StringUtil; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/AlarmSaveService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/AlarmSaveService.java index b903032..ce21c88 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/AlarmSaveService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/AlarmSaveService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.monitor.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java index 9ec38d8..06ca26c 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java @@ -2,19 +2,16 @@ package com.hnac.hzims.alarm.monitor.service.impl; import com.alibaba.fastjson.JSON; import com.hnac.hzims.alarm.config.service.AlarmConfigService; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.vo.AlarmHandleMarkVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo; import com.hnac.hzims.operational.station.feign.IStationClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.ObjectUtil; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.stereotype.Service; -import springfox.documentation.spring.web.json.Json; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java index e320b37..f14d600 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.mqtt; import com.alibaba.fastjson.JSONObject; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.DroolsAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import com.hnac.hzinfo.subscribe.SubscribeCallBack; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/FdpMqttConsumer.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/FdpMqttConsumer.java index e37e57c..97a8822 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/FdpMqttConsumer.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/FdpMqttConsumer.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.mqtt; import com.alibaba.fastjson.JSONObject; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.FdpAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import com.hnac.hzinfo.subscribe.SubscribeCallBack; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/HZ300MqttConsumer.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/HZ300MqttConsumer.java index b624c23..313583d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/HZ300MqttConsumer.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/HZ300MqttConsumer.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.mqtt; import com.alibaba.fastjson.JSONObject; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.SystemAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import com.hnac.hzinfo.subscribe.SubscribeCallBack; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/VideoMqttConsumer.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/VideoMqttConsumer.java index bc285e1..053c4df 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/VideoMqttConsumer.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/VideoMqttConsumer.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.mqtt; import com.alibaba.fastjson.JSONObject; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.VideoAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import com.hnac.hzinfo.subscribe.SubscribeCallBack; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java index 9f638cb..2963c71 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java @@ -4,7 +4,7 @@ package com.hnac.hzims.alarm.show.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.alarm.show.service.AlarmHandleService; -import com.hnac.hzims.alarm.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import com.hnac.hzims.common.logs.annotation.OperationAnnotation; import com.hnac.hzims.common.logs.enums.BusinessType; import com.hnac.hzims.common.logs.enums.OperatorType; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java index 178fba2..625e5b3 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java @@ -2,10 +2,10 @@ package com.hnac.hzims.alarm.show.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.SystemAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.vo.AlarmCountVo; +import com.hnac.hzims.alarm.config.vo.AlarmCountVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleDetailMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleDetailMapper.java index d7e5cec..781e51f 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleDetailMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleDetailMapper.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.show.mapper; -import com.hnac.hzims.alarm.entity.AlarmHandleDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHandleDetailEntity; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; /** diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java index 8a25d64..5fd4a71 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java @@ -1,8 +1,8 @@ package com.hnac.hzims.alarm.show.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.alarm.entity.AlarmHandleEntity; -import com.hnac.hzims.alarm.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import com.hnac.hzims.operational.alert.vo.HandleQueryVo; import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.annotation.UserDataAuth; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml index 78b9f15..b359e33 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml @@ -3,7 +3,7 @@ - SELECT H.*,HANDLE_USER,D.PHENOMENON_ID,D.ACCESS_ID,D.DELAY_TIME,D.DELAY_CAUSE, D.FALSE_ALARM_DESC,D.FILE_PATH,S.NAME AS STATION_NAME,P.CHECK_PROCESS_INSTANCE_ID,A.PROCESS_INSTANCE_ID FROM HZIMS_ALARM_HANDLE H diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java index 7e9d343..d6519c2 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.show.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; /** * @author ysj diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java index 3e7f4ba..19e72b9 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleDetailService.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.show.service; -import com.hnac.hzims.alarm.entity.AlarmHandleDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHandleDetailEntity; import org.springblade.core.mp.base.BaseService; /** diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java index 99ef712..0ae58b1 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java @@ -1,8 +1,8 @@ package com.hnac.hzims.alarm.show.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.alarm.entity.AlarmHandleEntity; -import com.hnac.hzims.alarm.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import com.hnac.hzims.operational.alert.vo.HandleQueryVo; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java index d9c7f56..ecc3077 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java @@ -1,8 +1,8 @@ package com.hnac.hzims.alarm.show.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.alarm.entity.AlarmEntity; -import com.hnac.hzims.alarm.vo.AlarmCountVo; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.vo.AlarmCountVo; import org.springblade.core.mp.base.BaseService; import org.springframework.web.socket.TextMessage; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java index a0d5703..36df866 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleDetailServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.show.service.impl; -import com.hnac.hzims.alarm.entity.AlarmHandleDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHandleDetailEntity; import com.hnac.hzims.alarm.show.mapper.AlarmHandleDetailMapper; import com.hnac.hzims.alarm.show.service.AlarmHandleDetailService; import lombok.RequiredArgsConstructor; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java index 5363fb1..b2d0169 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java @@ -1,16 +1,16 @@ package com.hnac.hzims.alarm.show.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.alarm.entity.AlarmHandleDetailEntity; -import com.hnac.hzims.alarm.entity.AlarmHandleEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHandleDetailEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity; import com.hnac.hzims.alarm.show.mapper.AlarmHandleMapper; import com.hnac.hzims.alarm.show.service.AlarmHandleDetailService; import com.hnac.hzims.alarm.show.service.AlarmHandleService; import com.hnac.hzims.alarm.show.wrapper.HandleWrapper; -import com.hnac.hzims.alarm.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import com.hnac.hzims.fdp.feign.IFdpMonitorClient; import com.hnac.hzims.fdp.vo.UpdateFaultStateVo; -import com.hnac.hzims.alarm.constants.AlarmHandleConstant; +import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant; import com.hnac.hzims.operational.alert.vo.HandleQueryVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,16 +19,12 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; -import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java index 6872338..f1accc5 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java @@ -4,14 +4,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.alarm.config.service.AlarmConfigService; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.show.mapper.AlarmMapper; import com.hnac.hzims.alarm.show.service.AlarmHandleService; import com.hnac.hzims.alarm.show.service.AlarmService; import com.hnac.hzims.alarm.source.service.MessageService; -import com.hnac.hzims.alarm.vo.AlarmCountVo; -import com.hnac.hzims.alarm.vo.ChildAlarmCountVo; +import com.hnac.hzims.alarm.config.vo.AlarmCountVo; +import com.hnac.hzims.alarm.config.vo.ChildAlarmCountVo; import com.hnac.hzims.message.dto.MailMessageDTO; import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.station.entity.StationEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java index 9fb55e9..990af3c 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.show.wrapper; -import com.hnac.hzims.alarm.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.user.cache.UserCache; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/mapper/AlarmHistoryMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/mapper/AlarmHistoryMapper.java index 25d3aed..37c25bf 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/mapper/AlarmHistoryMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/mapper/AlarmHistoryMapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.alarm.source.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.alarm.entity.AlarmHistoryEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHistoryEntity; /** * @author ysj diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java index d7ef128..27c14dc 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/AlarmHistoryService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmHistoryEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHistoryEntity; import org.springblade.core.mp.base.BaseService; /** diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/DroolsAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/DroolsAlarmService.java index 4d2b0da..1b07084 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/DroolsAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/DroolsAlarmService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/FdpAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/FdpAlarmService.java index e50da70..7fa86a2 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/FdpAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/FdpAlarmService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/LevelAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/LevelAlarmService.java index 903b81e..416d8c8 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/LevelAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/LevelAlarmService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/MessageService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/MessageService.java index 8496031..f2e499d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/MessageService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/MessageService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; /** * @author ysj diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/SystemAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/SystemAlarmService.java index 3adf860..fa6264c 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/SystemAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/SystemAlarmService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/VideoAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/VideoAlarmService.java index 4d7432b..67104e2 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/VideoAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/VideoAlarmService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import java.util.List; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java index 773d266..2ceee52 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/AlarmHistoryServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.source.service.impl; -import com.hnac.hzims.alarm.entity.AlarmHistoryEntity; +import com.hnac.hzims.alarm.config.entity.AlarmHistoryEntity; import com.hnac.hzims.alarm.source.mapper.AlarmHistoryMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/DroolsAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/DroolsAlarmServiceImpl.java index 1584d15..de80b7a 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/DroolsAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/DroolsAlarmServiceImpl.java @@ -2,11 +2,11 @@ package com.hnac.hzims.alarm.source.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.DroolsAlarmService; import com.hnac.hzims.alarm.source.service.MessageService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.vo.ConditionAlarmVo; +import com.hnac.hzims.alarm.config.vo.ConditionAlarmVo; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.hnac.hzims.alarm.constants.AlarmConstants.CONDITION; -import static com.hnac.hzims.alarm.constants.AlarmConstants.CONDITION_ALARM; +import static com.hnac.hzims.alarm.config.constants.AlarmConstants.CONDITION; +import static com.hnac.hzims.alarm.config.constants.AlarmConstants.CONDITION_ALARM; /** * 等级告警实现类 diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java index 48428a0..d87a9dc 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java @@ -2,11 +2,11 @@ package com.hnac.hzims.alarm.source.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.FdpAlarmService; import com.hnac.hzims.alarm.source.service.MessageService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.vo.FdpAlarmVo; +import com.hnac.hzims.alarm.config.vo.FdpAlarmVo; import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; @@ -26,8 +26,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import static com.hnac.hzims.alarm.constants.AlarmConstants.EARLY; -import static com.hnac.hzims.alarm.constants.AlarmConstants.EARLY_WARNING; +import static com.hnac.hzims.alarm.config.constants.AlarmConstants.EARLY; +import static com.hnac.hzims.alarm.config.constants.AlarmConstants.EARLY_WARNING; /** * 等级告警实现类 diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/LevelAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/LevelAlarmServiceImpl.java index c46e28b..41b318f 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/LevelAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/LevelAlarmServiceImpl.java @@ -2,13 +2,13 @@ package com.hnac.hzims.alarm.source.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.LevelAlarmService; import com.hnac.hzims.alarm.source.service.MessageService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.vo.LevelMessageVo; -import com.hnac.hzims.alarm.vo.LevelVo; +import com.hnac.hzims.alarm.config.vo.LevelMessageVo; +import com.hnac.hzims.alarm.config.vo.LevelVo; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; import com.hnac.hzims.operational.station.entity.StationEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java index 2f4c9be..1b2ebcf 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java @@ -2,7 +2,7 @@ package com.hnac.hzims.alarm.source.service.impl; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.hnac.hzims.alarm.config.service.AlarmConfigService; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.MessageService; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.BusinessMessageDTO; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/SystemAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/SystemAlarmServiceImpl.java index 6c09aae..a1f5c48 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/SystemAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/SystemAlarmServiceImpl.java @@ -2,14 +2,14 @@ package com.hnac.hzims.alarm.source.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.MessageService; import com.hnac.hzims.alarm.source.service.SystemAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.vo.SystemAlarmVo; +import com.hnac.hzims.alarm.config.vo.SystemAlarmVo; import com.hnac.hzims.message.fegin.IMessageClient; -import com.hnac.hzims.alarm.constants.AlarmHandleConstant; +import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; import lombok.RequiredArgsConstructor; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/VideoAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/VideoAlarmServiceImpl.java index 10ac876..16a7a37 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/VideoAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/VideoAlarmServiceImpl.java @@ -2,14 +2,14 @@ package com.hnac.hzims.alarm.source.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.VideoAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.message.fegin.IMessageClient; -import com.hnac.hzims.alarm.constants.AlarmHandleConstant; +import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; import com.hnac.hzinfo.datasearch.soe.ISoeClient; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/controller/AlarmTabulateController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/controller/AlarmTabulateController.java new file mode 100644 index 0000000..23b5544 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/controller/AlarmTabulateController.java @@ -0,0 +1,37 @@ +package com.hnac.hzims.alarm.tabulate.controller; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.alarm.tabulate.service.AlarmTabulateService; +import com.hnac.hzims.alarm.tabulate.vo.TabulateEarlyVo; +import com.hnac.hzinfo.sdk.v5.soe.vo.StbAnalysisVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author ysj + */ +@Api(tags = {"告警历史查询"}) +@RestController +@AllArgsConstructor +@RequestMapping("/tabulate") +public class AlarmTabulateController extends BladeController { + + private final AlarmTabulateService tabulateService; + + @GetMapping("/early") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "智能预警", notes = "传入查询参数") + public R> early(TabulateEarlyVo param, Query query) { + return R.data(tabulateService.early(Condition.getPage(query), param)); + } +} diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/AlarmTabulateService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/AlarmTabulateService.java new file mode 100644 index 0000000..23790e0 --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/AlarmTabulateService.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.alarm.tabulate.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.tabulate.vo.TabulateEarlyVo; +import com.hnac.hzinfo.sdk.v5.soe.vo.StbAnalysisVO; +import org.springblade.core.mp.support.Query; + +/** + * @author ysj + */ +public interface AlarmTabulateService { + + IPage early(IPage page, TabulateEarlyVo param); +} diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java new file mode 100644 index 0000000..b14ed6a --- /dev/null +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/tabulate/service/impl/AlarmTabulateServiceImpl.java @@ -0,0 +1,55 @@ +package com.hnac.hzims.alarm.tabulate.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; +import com.hnac.hzims.alarm.tabulate.service.AlarmTabulateService; +import com.hnac.hzims.alarm.tabulate.vo.TabulateEarlyVo; +import com.hnac.hzinfo.sdk.core.response.HzPage; +import com.hnac.hzinfo.sdk.core.response.Result; +import com.hnac.hzinfo.sdk.v5.soe.SoeDataClient; +import com.hnac.hzinfo.sdk.v5.soe.dto.StbAnalysisDTO; +import com.hnac.hzinfo.sdk.v5.soe.vo.StbAnalysisVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collections; + +/** + * @author ysj + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class AlarmTabulateServiceImpl implements AlarmTabulateService { + + private final SoeDataClient soeDataClient; + + @Override + public IPage early(IPage page, TabulateEarlyVo tabulateEarly) { + StbAnalysisDTO param = new StbAnalysisDTO(); + if(StringUtil.isNotBlank(tabulateEarly.getStartTime())){ + param.setStartTime(LocalDateTime.parse(tabulateEarly.getStartTime(), DateUtil.DATETIME_FORMATTER)); + } + if(StringUtil.isNotBlank(tabulateEarly.getEndTime())){ + param.setEndTime(LocalDateTime.parse(tabulateEarly.getEndTime(), DateUtil.DATETIME_FORMATTER)); + } + param.setPage((int) page.getCurrent()); + param.setPageSize((int) page.getSize()); + Result> result = soeDataClient.pageStbAnalysis(param); + if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData().getRecords())){ + page.setRecords(new ArrayList<>()); + page.setTotal(0L); + return page; + } + page.setTotal(result.getData().getTotal()); + page.setRecords(result.getData().getRecords()); + return page; + } +} \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/task/VideoScheduledTask.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/task/VideoScheduledTask.java index 169d8ca..c0e2539 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/task/VideoScheduledTask.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/task/VideoScheduledTask.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.task; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.VideoAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import com.xxl.job.core.biz.model.ReturnT; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmWebSocket.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmWebSocket.java index cdbb5a4..83f36a3 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmWebSocket.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmWebSocket.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.ws.level; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.alarm.source.service.LevelAlarmService; import com.hnac.hzims.alarm.monitor.service.AlarmSaveService; import lombok.extern.slf4j.Slf4j; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/alarm/AlarmQueryMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/alarm/AlarmQueryMapper.java index a2f4840..ea13388 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/alarm/AlarmQueryMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/alarm/AlarmQueryMapper.java @@ -1,7 +1,7 @@ package com.hnac.hzims.scheduled.mapper.alarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; /** * @author ysj diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java index 37b1314..5b8f793 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/AlarmQueryService.java @@ -1,6 +1,6 @@ package com.hnac.hzims.scheduled.service.alarm; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import org.springblade.core.mp.base.BaseService; import java.util.List; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java index 3518db9..fd31272 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java @@ -3,8 +3,8 @@ package com.hnac.hzims.scheduled.service.alarm.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hnac.hzims.alarm.constants.AlarmConstants; -import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.config.constants.AlarmConstants; +import com.hnac.hzims.alarm.config.entity.AlarmEntity; import com.hnac.hzims.operational.main.constant.HomePageConstant; import com.hnac.hzims.operational.main.vo.HydropowerUnitRealVo; import com.hnac.hzims.operational.station.entity.StationEntity; @@ -13,7 +13,6 @@ import com.hnac.hzims.scheduled.service.alarm.AlarmQueryService; import com.hnac.hzims.scheduled.service.operation.station.StationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.MapUtils; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil;