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 index 1021c07..ed28604 100644 --- 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 @@ -65,4 +65,29 @@ public class AlarmEntity extends TenantEntity { @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/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java index b9aa407..02ccc38 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java @@ -99,4 +99,9 @@ public class IEmInfoClientBack implements IEmInfoClient { public R> getChildrenByEmCode(String emCode) { return R.fail("远程调用失败"); } + + @Override + public List getVideoDeviceByEmCode(EmInfoEntity emInfo) { + return new ArrayList<>(); + } } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmHistoryMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/mapper/AlarmHistoryMapper.java similarity index 83% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmHistoryMapper.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/mapper/AlarmHistoryMapper.java index 74194c3..4b2d713 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmHistoryMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/mapper/AlarmHistoryMapper.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.config.mapper; +package com.hnac.hzims.alarm.handle.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.alarm.entity.AlarmHistoryEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmHistoryMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/mapper/AlarmHistoryMapper.xml similarity index 72% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmHistoryMapper.xml rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/mapper/AlarmHistoryMapper.xml index 8b355d0..f6dd5d6 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmHistoryMapper.xml +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/mapper/AlarmHistoryMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHistoryService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/AlarmHistoryService.java similarity index 81% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHistoryService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/AlarmHistoryService.java index fe78e50..3805436 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHistoryService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/AlarmHistoryService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmHistoryEntity; import org.springblade.core.mp.base.BaseService; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/ConditionAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/ConditionAlarmService.java similarity index 83% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/ConditionAlarmService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/ConditionAlarmService.java index 0b1544d..f2c7364 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/ConditionAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/ConditionAlarmService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/FdpAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/FdpAlarmService.java similarity index 84% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/FdpAlarmService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/FdpAlarmService.java index cafb946..bbb248d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/FdpAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/FdpAlarmService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/LevelAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/LevelAlarmService.java similarity index 83% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/LevelAlarmService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/LevelAlarmService.java index bf2c3a3..4d3a695 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/LevelAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/LevelAlarmService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/MessageService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/MessageService.java similarity index 83% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/MessageService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/MessageService.java index 1e27dc0..92b3f74 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/MessageService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/MessageService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/SystemAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/SystemAlarmService.java similarity index 84% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/SystemAlarmService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/SystemAlarmService.java index 6dc2969..42f44d8 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/SystemAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/SystemAlarmService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/VideoAlarmService.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/VideoAlarmService.java similarity index 84% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/VideoAlarmService.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/VideoAlarmService.java index 69ec3b2..2751346 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/VideoAlarmService.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/VideoAlarmService.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.show.service; +package com.hnac.hzims.alarm.handle.service; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHistoryServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/AlarmHistoryServiceImpl.java similarity index 58% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHistoryServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/AlarmHistoryServiceImpl.java index b2ae4af..2de5d10 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHistoryServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/AlarmHistoryServiceImpl.java @@ -1,10 +1,10 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.service.impl; import com.hnac.hzims.alarm.entity.AlarmHistoryEntity; -import com.hnac.hzims.alarm.config.mapper.AlarmHistoryMapper; -import com.hnac.hzims.alarm.show.service.AlarmHistoryService; +import com.hnac.hzims.alarm.handle.mapper.AlarmHistoryMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; @@ -14,6 +14,6 @@ import org.springframework.stereotype.Service; @AllArgsConstructor @Service @Slf4j -public class AlarmHistoryServiceImpl extends BaseServiceImpl implements AlarmHistoryService { +public class AlarmHistoryServiceImpl extends BaseServiceImpl implements BaseService { } \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/ConditionAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/ConditionAlarmServiceImpl.java similarity index 89% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/ConditionAlarmServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/ConditionAlarmServiceImpl.java index 7fd2384..c04ba7a 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/ConditionAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/ConditionAlarmServiceImpl.java @@ -1,11 +1,11 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.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.handle.service.ConditionAlarmService; +import com.hnac.hzims.alarm.handle.service.MessageService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.ConditionAlarmService; -import com.hnac.hzims.alarm.show.service.MessageService; import com.hnac.hzims.alarm.vo.ConditionAlarmVo; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.station.entity.StationEntity; @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.hnac.hzims.alarm.constants.AlarmConstants.*; +import static com.hnac.hzims.alarm.constants.AlarmConstants.CONDITION; +import static com.hnac.hzims.alarm.constants.AlarmConstants.CONDITION_ALARM; /** * 等级告警实现类 diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/FdpAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/FdpAlarmServiceImpl.java similarity index 95% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/FdpAlarmServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/FdpAlarmServiceImpl.java index a223553..f801958 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/FdpAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/FdpAlarmServiceImpl.java @@ -1,11 +1,11 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.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.handle.service.FdpAlarmService; +import com.hnac.hzims.alarm.handle.service.MessageService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.FdpAlarmService; -import com.hnac.hzims.alarm.show.service.MessageService; import com.hnac.hzims.alarm.vo.FdpAlarmVo; 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/service/impl/LevelAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/LevelAlarmServiceImpl.java similarity index 95% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/LevelAlarmServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/LevelAlarmServiceImpl.java index f8ad2cd..3f3c926 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/LevelAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/LevelAlarmServiceImpl.java @@ -1,12 +1,12 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.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.handle.service.LevelAlarmService; +import com.hnac.hzims.alarm.handle.service.MessageService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.LevelAlarmService; -import com.hnac.hzims.alarm.show.service.MessageService; import com.hnac.hzims.alarm.vo.LevelMessageVo; import com.hnac.hzims.alarm.vo.LevelVo; import com.hnac.hzims.equipment.feign.IEmInfoClient; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/MessageServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/MessageServiceImpl.java similarity index 96% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/MessageServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/MessageServiceImpl.java index 765dbeb..9e62c3f 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/MessageServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/MessageServiceImpl.java @@ -1,10 +1,10 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.service.impl; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; 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.show.service.MessageService; +import com.hnac.hzims.alarm.handle.service.MessageService; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.BusinessMessageDTO; import com.hnac.hzims.message.fegin.IMessageClient; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/SystemAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/SystemAlarmServiceImpl.java similarity index 95% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/SystemAlarmServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/SystemAlarmServiceImpl.java index 9f878fb..e73da1a 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/SystemAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/SystemAlarmServiceImpl.java @@ -1,12 +1,12 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.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.handle.service.MessageService; +import com.hnac.hzims.alarm.handle.service.SystemAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.MessageService; -import com.hnac.hzims.alarm.show.service.SystemAlarmService; import com.hnac.hzims.alarm.vo.SystemAlarmVo; import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.alert.constants.AbnormalAlarmConstant; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/VideoAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/VideoAlarmServiceImpl.java similarity index 97% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/VideoAlarmServiceImpl.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/VideoAlarmServiceImpl.java index e9edfb2..0c0447d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/VideoAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/handle/service/impl/VideoAlarmServiceImpl.java @@ -1,11 +1,11 @@ -package com.hnac.hzims.alarm.show.service.impl; +package com.hnac.hzims.alarm.handle.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.handle.service.VideoAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.VideoAlarmService; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.message.fegin.IMessageClient; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/fdpMqttConfig.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/fdpMqttConfig.java index dde46d4..f0f4d96 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/fdpMqttConfig.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/fdpMqttConfig.java @@ -19,7 +19,7 @@ public class fdpMqttConfig { @Autowired fdpMqttConsumer fdpMqttConsumer; - @Value("${hzims.mqtt.fdp-url}") + /*@Value("${hzims.mqtt.fdp-url}") private String mqtt_fdp_url; @Value("${hzims.mqtt.fdp-group}") private String mqtt_fdp_group; @@ -28,7 +28,7 @@ public class fdpMqttConfig { @Value("${hzims.mqtt.fdp-username}") private String mqtt_fdp_username; @Value("${hzims.mqtt.fdp-topname}") - private String mqtt_fdp_topname; + private String mqtt_fdp_topname;*/ @PostConstruct public void registerMqtt(){ try { 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 5fdd86a..fe90f1b 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 @@ -2,8 +2,8 @@ package com.hnac.hzims.alarm.mqtt; import com.alibaba.fastjson.JSONObject; import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.handle.service.FdpAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.FdpAlarmService; import com.hnac.hzinfo.subscribe.SubscribeCallBack; import org.springblade.core.log.exception.ServiceException; import org.springframework.beans.factory.annotation.Autowired; 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 c1b113c..3c9eb67 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 @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.handle.service.SystemAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.SystemAlarmService; import com.hnac.hzims.alarm.vo.AlarmCountVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,75 +29,34 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/alarm/show") +@RequestMapping("/alarm") @Api(value = "告警配置", tags = "告警配置") public class ShowAlarmController extends BladeController { - @Autowired - private AlarmService alarmService; + private AlarmService alarmService; + private SystemAlarmService systemAlarmService; - @PostMapping("/alarms") + @GetMapping("/broadcast") @ApiOperationSupport(order = 1) + @ApiOperation(value = "播报告警", notes = "传入:时间区间") + public R> broadcast(@ApiParam(value = "开始时间", required = false) String startTime, + @ApiParam(value = "结束时间", required = true) String endTime) { + return R.data(alarmService.broadcast(startTime,endTime)); + } + + @PostMapping("/show") + @ApiOperationSupport(order = 2) @ApiOperation(value = "告警列表分页", notes = "传入: AlarmConfigEntity对象,分页参数") public R> alarms(@ApiIgnore @RequestParam AlarmEntity alarm, Query query) { return R.data(alarmService.alarms(alarm,Condition.getPage(query))); } @PostMapping("/count") - @ApiOperationSupport(order = 1) + @ApiOperationSupport(order = 3) @ApiOperation(value = "告警分类数量", notes = "不需要传入参数") public R> counts() { return R.data(alarmService.counts()); } - - @PostMapping("/save") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "新增", notes = "传入AlarmEntity对象") - public R save(@Valid @RequestBody AlarmEntity entity) { - return R.status(alarmService.save(entity)); - } - - @PostMapping("/update") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "修改", notes = "传入AlarmEntity对象") - public R update(@Valid @RequestBody AlarmEntity entity) { - return R.status(alarmService.updateById(entity)); - } - - - @PostMapping("/remove") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(alarmService.deleteLogic(Func.toLongList(ids))); - } - - - @GetMapping("/list") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "分页", notes = "传入em_model_param") - public R> list(@ApiIgnore @RequestParam Map params, Query query) { - QueryWrapper queryWrapper = Condition.getQueryWrapper( params, AlarmEntity.class); - IPage pages = alarmService.page(Condition.getPage(query), queryWrapper); - return R.data(pages); - } - - @GetMapping("/detail") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "详情", notes = "传入em_model_param") - public R detail(AlarmEntity entity) { - AlarmEntity detail = alarmService.getOne(Condition.getQueryWrapper(entity)); - return R.data(detail); - } - @PostMapping("/test") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "详情", notes = "传入em_model_param") - public R test(@RequestBody String param) { - systemAlarmService.receiveMessage(param); - return R.success("结束"); - } - - -} +} \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java similarity index 81% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmMapper.java rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java index 455f550..7e9d343 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.alarm.config.mapper; +package com.hnac.hzims.alarm.show.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.alarm.entity.AlarmEntity; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.xml similarity index 69% rename from hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmMapper.xml rename to hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.xml index 4a83fce..3fd4b39 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/mapper/AlarmMapper.xml +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmMapper.xml @@ -1,5 +1,5 @@ - + 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 be1c599..1ab1026 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 @@ -16,10 +16,7 @@ public interface AlarmService extends BaseService { List counts(); - /** - * websocket 消息推送保存 - * @param param - */ - void dealAlarmEntities(List param); + List broadcast(String startTime, String endTime); + void dealAlarmEntities(List param); } \ No newline at end of file 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 283b00e..19a912e 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 @@ -3,16 +3,18 @@ package com.hnac.hzims.alarm.show.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hnac.hzims.alarm.config.mapper.AlarmMapper; 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.handle.service.MessageService; +import com.hnac.hzims.alarm.show.mapper.AlarmMapper; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.MessageService; import com.hnac.hzims.alarm.vo.AlarmCountVo; import com.hnac.hzims.alarm.vo.ChildAlarmCountVo; import com.hnac.hzims.message.dto.MailMessageDTO; import com.hnac.hzims.message.fegin.IMessageClient; +import com.hnac.hzims.operational.station.entity.StationEntity; +import com.hnac.hzims.operational.station.feign.IStationClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; @@ -39,11 +41,16 @@ import java.util.stream.Collectors; @Slf4j public class AlarmServiceImpl extends BaseServiceImpl implements AlarmService { - private final AlarmConfigService configService; private final MessageService messageService; - private final IMessageClient messageClient; + + private final AlarmConfigService configService; + private final IUserClient userClient; + private final IStationClient stationClient; + + private final IMessageClient messageClient; + /** * 查询告警列表 * @param alarm @@ -52,11 +59,15 @@ public class AlarmServiceImpl extends BaseServiceImpl */ @Override public IPage alarms(AlarmEntity alarm, IPage page) { - // 排除站点 - List codes = configService.exclude(AlarmConstants.IS_RIGHT_TABULATION); + List stations = this.stations(); + if(CollectionUtil.isEmpty(stations)){ + return page; + } // 参数过滤 ：站点、告警来源、告警子类 QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("IS_RIGHT_TABULATION",0); + wrapper.in("STATION_ID",stations.stream().map(StationEntity::getCode).collect(Collectors.toList())); if(!StringUtil.isEmpty(alarm.getStationId())){ wrapper.eq("STATION_ID",alarm.getStationId()); } @@ -66,29 +77,49 @@ public class AlarmServiceImpl extends BaseServiceImpl if(!StringUtil.isEmpty(alarm.getAlarmType())){ wrapper.eq("ALARM_TYPE",alarm.getAlarmType()); } - if(!CollectionUtil.isEmpty(codes)){ - wrapper.notIn("STATION_ID",codes); - } + // 查询数据 return this.page(page,wrapper); } /** + * 获取权限站点 + * @return + */ + private List stations() { + StationEntity station = new StationEntity(); + station.setServeType("2"); + station.setType(0); + R> result = stationClient.list(station); + if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ + return new ArrayList<>(); + } + return result.getData(); + } + + /** * 查询告警数量 * @return */ @Override public List counts() { - // 排除站点 - List codes = configService.exclude(AlarmConstants.IS_RIGHT_TABULATION); + // 站点查询 + List stations = this.stations(); + if(CollectionUtil.isEmpty(stations)){ + return AlarmConstants.ALARAM_SOURCE.stream().map(source->{ + AlarmCountVo count = new AlarmCountVo(); + count.setType(source); + count.setCount(0L); + return count; + }).collect(Collectors.toList()); + } - // 查询告警数据 + // 参数过滤 ：站点、告警来源、告警子类 QueryWrapper wrapper = new QueryWrapper<>(); - if(CollectionUtil.isNotEmpty(codes)){ - wrapper.notIn("STATION_ID",codes); - } + wrapper.eq("IS_RIGHT_TABULATION",0); + wrapper.in("STATION_ID",stations.stream().map(StationEntity::getCode).collect(Collectors.toList())); + // 查询告警数据 List alarms = this.list(wrapper); - // 查询数量 return AlarmConstants.ALARAM_SOURCE.stream().map(source->{ AlarmCountVo count = new AlarmCountVo(); @@ -104,6 +135,31 @@ public class AlarmServiceImpl extends BaseServiceImpl } /** + * 播报告警 + * @param startTime + * @param endTime + * @return + */ + @Override + public List broadcast(String startTime, String endTime) { + // 站点查询 + List stations = this.stations(); + if(CollectionUtil.isEmpty(stations)){ + return new ArrayList<>(); + } + // 参数过滤 ：站点、告警来源、告警子类 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("IS_BROADCAST",0); + wrapper.in("STATION_ID",stations.stream().map(StationEntity::getCode).collect(Collectors.toList())); + wrapper.le("CREATE_TIME",endTime); + if(!StringUtil.isEmpty(startTime)){ + wrapper.ge("CREATE_TIME",startTime); + } + // 查询播报告警 + return this.list(wrapper); + } + + /** * websocket 消息推送保存 * @param param */ 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 2d1fa0b..05e61aa 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,8 +1,8 @@ package com.hnac.hzims.alarm.task; import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.handle.service.VideoAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.VideoAlarmService; import com.xxl.job.core.biz.model.ReturnT; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmRegular.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmRegular.java index 18d9059..900bbc0 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmRegular.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmRegular.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.ws.condition; -import com.hnac.hzims.alarm.show.service.ConditionAlarmService; +import com.hnac.hzims.alarm.handle.service.ConditionAlarmService; import com.hnac.hzims.alarm.ws.level.LevelAlarmWebSocket; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.ObjectUtil; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmWebSocket.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmWebSocket.java index f619d8b..f3078ea 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmWebSocket.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/condition/ConditionAlarmWebSocket.java @@ -1,8 +1,8 @@ package com.hnac.hzims.alarm.ws.condition; import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.handle.service.ConditionAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.ConditionAlarmService; import lombok.extern.slf4j.Slf4j; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmRegular.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmRegular.java index 63e9814..5631319 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmRegular.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmRegular.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.ws.fdp; -import com.hnac.hzims.alarm.show.service.FdpAlarmService; +import com.hnac.hzims.alarm.handle.service.FdpAlarmService; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmWebSocket.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmWebSocket.java index fc51f00..f8513a0 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmWebSocket.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/fdp/FdpAlarmWebSocket.java @@ -1,8 +1,8 @@ package com.hnac.hzims.alarm.ws.fdp; import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.handle.service.FdpAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.FdpAlarmService; import lombok.extern.slf4j.Slf4j; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmRegular.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmRegular.java index 675aa47..71712aa 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmRegular.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmRegular.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.ws.hz3000; -import com.hnac.hzims.alarm.show.service.SystemAlarmService; +import com.hnac.hzims.alarm.handle.service.SystemAlarmService; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmWebSocket.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmWebSocket.java index 9d0d12d..fa019c9 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmWebSocket.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/hz3000/SystemAlarmWebSocket.java @@ -1,8 +1,8 @@ package com.hnac.hzims.alarm.ws.hz3000; import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.handle.service.SystemAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.SystemAlarmService; import lombok.extern.slf4j.Slf4j; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmRegular.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmRegular.java index f1b1e16..d2726b8 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmRegular.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/level/LevelAlarmRegular.java @@ -1,6 +1,6 @@ package com.hnac.hzims.alarm.ws.level; -import com.hnac.hzims.alarm.show.service.LevelAlarmService; +import com.hnac.hzims.alarm.handle.service.LevelAlarmService; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; 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 88d7e3a..b9691f3 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,8 +1,8 @@ package com.hnac.hzims.alarm.ws.level; import com.hnac.hzims.alarm.entity.AlarmEntity; +import com.hnac.hzims.alarm.handle.service.LevelAlarmService; import com.hnac.hzims.alarm.show.service.AlarmService; -import com.hnac.hzims.alarm.show.service.LevelAlarmService; import lombok.extern.slf4j.Slf4j; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake;