From 6aaae83f4f70ad092c3d8c9cd5dd07a945466b56 Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Tue, 25 Aug 2026 10:47:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=9B=90=E6=BA=90ws?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3(=E9=80=9A=E8=BF=87AlarmPublisher=E5=8F=91?= =?UTF-8?q?=E9=80=81ws)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/core/web/domain/AjaxResult.java | 4 + .../handler/GlobalExceptionHandler.java | 3 +- inspect-main/inspect-main-api/pom.xml | 11 +- .../inspect/api/config/RabbitMQConfig.java | 35 +++++ .../api/constant/YanyuanConstants.java | 10 ++ .../api/controller/AlarmController.java | 62 ++++++++ .../com/inspect/api/domain/AlarmMessage.java | 17 +++ .../com/inspect/api/domain/ApiResult.java | 12 ++ .../com/inspect/api/domain/AuthTokenData.java | 12 ++ .../com/inspect/api/enums/AlarmCategory.java | 17 +++ .../com/inspect/api/enums/MessageType.java | 14 ++ .../com/inspect/api/enums/SystemCode.java | 15 ++ .../com/inspect/api/props/AppProperties.java | 15 ++ .../inspect/api/service/AlarmConsumer.java | 37 +++++ .../inspect/api/service/AlarmPublisher.java | 26 ++++ .../inspect/api/service/ExtAuthService.java | 41 ++++++ .../api/websocket/AlarmWsConnection.java | 139 ++++++++++++++++++ .../src/main/resources/bootstrap.yaml | 10 +- 18 files changed, 472 insertions(+), 8 deletions(-) create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/config/RabbitMQConfig.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/constant/YanyuanConstants.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/controller/AlarmController.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AlarmMessage.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/ApiResult.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AuthTokenData.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/AlarmCategory.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/MessageType.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/SystemCode.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/props/AppProperties.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmConsumer.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmPublisher.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/ExtAuthService.java create mode 100644 inspect-main/inspect-main-api/src/main/java/com/inspect/api/websocket/AlarmWsConnection.java diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/web/domain/AjaxResult.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/web/domain/AjaxResult.java index 3f0f0e8..f0bf2a6 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/web/domain/AjaxResult.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/web/domain/AjaxResult.java @@ -63,6 +63,10 @@ public class AjaxResult extends HashMap { return new AjaxResult(code, msg, null); } + public static AjaxResult error(int code, String msg, Object data) { + return new AjaxResult(code, msg, data); + } + public static AjaxResult fail(Integer code, String msg, Object data) { return new AjaxResult(code, msg, data); } diff --git a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java index ba4eaa2..4066f3f 100644 --- a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java +++ b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/handler/GlobalExceptionHandler.java @@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.validation.BindException; -import org.springframework.validation.ObjectError; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -51,7 +50,7 @@ public class GlobalExceptionHandler { public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) { log.error(e.getMessage(), e); Integer code = e.getCode(); - return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage()); + return StringUtils.isNotNull(code) ? AjaxResult.error(code, "服务器异常，请稍后再试", e.getMessage()) : AjaxResult.error("服务器异常，请稍后再试", e.getMessage()); } @ExceptionHandler({RuntimeException.class}) diff --git a/inspect-main/inspect-main-api/pom.xml b/inspect-main/inspect-main-api/pom.xml index 9866549..32fcdc5 100644 --- a/inspect-main/inspect-main-api/pom.xml +++ b/inspect-main/inspect-main-api/pom.xml @@ -22,7 +22,6 @@ org.springframework.boot spring-boot-starter - org.springframework.boot spring-boot-starter-test @@ -32,6 +31,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + + org.springframework.boot + spring-boot-starter-amqp + com.inspect inspect-base-core diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/config/RabbitMQConfig.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/config/RabbitMQConfig.java new file mode 100644 index 0000000..4c11d4a --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/config/RabbitMQConfig.java @@ -0,0 +1,35 @@ +package com.inspect.api.config; + +import com.inspect.api.constant.YanyuanConstants; +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.core.TopicExchange; +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.amqp.support.converter.MessageConverter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class RabbitMQConfig { + + @Bean + public TopicExchange alarmExchange() { + return new TopicExchange(YanyuanConstants.EXCHANGE, true, false); + } + + @Bean("alarmQueue") + public Queue alarmQueue() { + return new Queue(YanyuanConstants.QUEUE, true); + } + + @Bean + public Binding alarmBinding() { + return BindingBuilder.bind(alarmQueue()).to(alarmExchange()).with(YanyuanConstants.EXCHANGE); + } + + @Bean + public MessageConverter messageConverter() { + return new Jackson2JsonMessageConverter(); + } +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/constant/YanyuanConstants.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/constant/YanyuanConstants.java new file mode 100644 index 0000000..ec7758e --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/constant/YanyuanConstants.java @@ -0,0 +1,10 @@ +package com.inspect.api.constant; + +public class YanyuanConstants { + + private YanyuanConstants() {} + + public static final String EXCHANGE = "alarm.exchange"; + public static final String QUEUE = "alarm.queue"; + public static final String ROUTING_KEY = "alarm.routing-key"; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/controller/AlarmController.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/controller/AlarmController.java new file mode 100644 index 0000000..d477b58 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/controller/AlarmController.java @@ -0,0 +1,62 @@ +package com.inspect.api.controller; + +import com.inspect.api.domain.AlarmMessage; +import com.inspect.api.domain.ApiResult; +import com.inspect.api.domain.AuthTokenData; +import com.inspect.api.enums.AlarmCategory; +import com.inspect.api.enums.MessageType; +import com.inspect.api.enums.SystemCode; +import com.inspect.api.service.AlarmPublisher; +import com.inspect.api.service.ExtAuthService; +import com.inspect.base.core.web.controller.BaseController; +import com.inspect.base.core.web.domain.AjaxResult; +import com.inspect.base.core.web.page.TableDataInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/v1/api/alarm") +public class AlarmController extends BaseController { + private final ExtAuthService extAuthService; + private final AlarmPublisher alarmPublisher; + + public AlarmController(ExtAuthService extAuthService, AlarmPublisher alarmPublisher) { + this.extAuthService = extAuthService; + this.alarmPublisher = alarmPublisher; + } + + @PostMapping("/history") + @ResponseBody + public TableDataInfo list(AlarmMessage alarmMessage) { + startPage(); + List list = new ArrayList<>(); + list.add(AlarmMessage.builder() + .messageType(MessageType.ALARM.getCode()) + .alarmCategory(AlarmCategory.APPEARANCE_DEFECT.getCode()) + .systemCode(SystemCode.PATROL.getCode()) + .build()); +// List list = jobLogService.selectJobLogList(jobLog); + return getDataTable(list); + } + + @GetMapping("/getToken") + public AjaxResult getToken(String clientId, String clientSecret) { + ApiResult result = extAuthService.getAuthToken(clientId, clientSecret); + log.info("Result={}", result); + return AjaxResult.success(result.getData()); + } + + @PostMapping("/push") + @ResponseBody + public AjaxResult push(AlarmMessage msg) { + if (msg != null) { + alarmPublisher.publish(msg); + return AjaxResult.success(msg); + } + return AjaxResult.error(); + } +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AlarmMessage.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AlarmMessage.java new file mode 100644 index 0000000..5c0fd73 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AlarmMessage.java @@ -0,0 +1,17 @@ +package com.inspect.api.domain; + +import com.inspect.base.core.web.domain.BaseEntity; +import lombok.*; + +@ToString +@Data +@Builder +public class AlarmMessage extends BaseEntity { + private String messageId; + private String messageType; + // 告警类型: messageType = alarm_push时传入 + private String alarmCategory; + private String timestamp; + private String systemCode; + private Object data; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/ApiResult.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/ApiResult.java new file mode 100644 index 0000000..a014e77 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/ApiResult.java @@ -0,0 +1,12 @@ +package com.inspect.api.domain; + +import lombok.Data; + +@Data +public class ApiResult { + private boolean success; + private T data; + private String hintMessage; + private String type; + private int code; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AuthTokenData.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AuthTokenData.java new file mode 100644 index 0000000..456131d --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/domain/AuthTokenData.java @@ -0,0 +1,12 @@ +package com.inspect.api.domain; + +import lombok.Data; + +@Data +public class AuthTokenData { + private String access_token; + private String token_type; + private String scope; + private String userId; + private String jti; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/AlarmCategory.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/AlarmCategory.java new file mode 100644 index 0000000..66365a0 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/AlarmCategory.java @@ -0,0 +1,17 @@ +package com.inspect.api.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum AlarmCategory { + FIRE_SMOKE("fire_smoke", "烟火报警"), + NO_HELMET("no_helmet", "未佩戴安全帽报警"), + NO_UNIFORM("no_uniform", "未穿工装报警"), + METER_OVERRUN("meter_overrun", "红外温度超限报警"), + APPEARANCE_DEFECT("appearance_defect", "外观缺陷告警"); + + final private String code; + final private String value; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/MessageType.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/MessageType.java new file mode 100644 index 0000000..bf70824 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/MessageType.java @@ -0,0 +1,14 @@ +package com.inspect.api.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MessageType { + ALARM("alarm_push", "告警推送"), + REPORT("report_push", "报告推送"); + + final private String code; + final private String value; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/SystemCode.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/SystemCode.java new file mode 100644 index 0000000..30870e8 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/enums/SystemCode.java @@ -0,0 +1,15 @@ +package com.inspect.api.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum SystemCode { + PE("power&environment", "动环"), + FIREFIGHTING("firefighting", "消防"), + PATROL("patrol", "巡检"); + + final private String code; + final private String value; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/props/AppProperties.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/props/AppProperties.java new file mode 100644 index 0000000..3a27028 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/props/AppProperties.java @@ -0,0 +1,15 @@ +package com.inspect.api.props; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "yanyuan.auth") +public class AppProperties { + private String baseUrl; + private String wsUrl; + private String clientId; + private String clientSecret; +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmConsumer.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmConsumer.java new file mode 100644 index 0000000..f941e62 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmConsumer.java @@ -0,0 +1,37 @@ +package com.inspect.api.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.inspect.api.domain.AlarmMessage; +import com.inspect.api.websocket.AlarmWsConnection; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class AlarmConsumer { + private final AlarmWsConnection wsConnection; + private final ObjectMapper objectMapper; + + public AlarmConsumer(AlarmWsConnection wsConnection, ObjectMapper objectMapper) { + this.wsConnection = wsConnection; + this.objectMapper = objectMapper; + } + + @RabbitListener(queues = "#{alarmQueue.name}") + public void onAlarm(AlarmMessage msg) { + try { + String json = objectMapper.writeValueAsString(msg); + boolean sent = wsConnection.send(json); + if (sent) { + log.info("Alarm sent to WS: msg={}", msg); + } else { + log.warn("Alarm not sent, WS not connected: msg={}", msg); + throw new RuntimeException("WS not connected, message will be requeued"); + } + } catch (Exception e) { + log.error("Alarm consumer error: {}", e.getMessage()); + throw new RuntimeException("Alarm processing failed", e); + } + } +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmPublisher.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmPublisher.java new file mode 100644 index 0000000..ac38275 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/AlarmPublisher.java @@ -0,0 +1,26 @@ +package com.inspect.api.service; + +import com.inspect.api.constant.YanyuanConstants; +import com.inspect.api.domain.AlarmMessage; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class AlarmPublisher { + private final RabbitTemplate rabbitTemplate; + + public AlarmPublisher(RabbitTemplate rabbitTemplate) { + this.rabbitTemplate = rabbitTemplate; + } + + public void publish(AlarmMessage msg) { + try { + rabbitTemplate.convertAndSend(YanyuanConstants.EXCHANGE, YanyuanConstants.ROUTING_KEY, msg); + log.info("Alert published: msg={}", msg); + } catch (Exception e) { + log.error("Failed to publish alert: {}", e.getMessage()); + } + } +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/ExtAuthService.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/ExtAuthService.java new file mode 100644 index 0000000..b427673 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/ExtAuthService.java @@ -0,0 +1,41 @@ +package com.inspect.api.service; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.inspect.api.domain.ApiResult; +import com.inspect.api.domain.AuthTokenData; +import com.inspect.api.props.AppProperties; +import com.inspect.base.core.utils.HttpClientUtils; +import org.springframework.stereotype.Service; + +@Service +public class ExtAuthService { + private static final String TOKEN_HEADER = "joinbright-token"; + + private final ObjectMapper objectMapper; + private final AppProperties appProperties; + + public ExtAuthService(ObjectMapper objectMapper, AppProperties appProperties) { + this.objectMapper = objectMapper; + this.appProperties = appProperties; + } + + public ApiResult getAuthToken() { + return getAuthToken(appProperties.getClientId(), appProperties.getClientSecret()); + } + + public ApiResult getAuthToken(String clientId, String clientSecret) { + String url = appProperties.getBaseUrl() + "/ext_auth/getAuthToken"; + String param = "clientId=" + clientId + "&clientSecret=" + clientSecret; + return executeGet(url, param, new TypeReference>() {}); + } + + private ApiResult executeGet(String url, String param, TypeReference> typeRef) { + try { + String json = HttpClientUtils.get(url, param); + return objectMapper.readValue(json, typeRef); + } catch (Exception e) { + throw new RuntimeException("HTTP GET failed: " + url, e); + } + } +} diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/websocket/AlarmWsConnection.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/websocket/AlarmWsConnection.java new file mode 100644 index 0000000..e47e405 --- /dev/null +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/websocket/AlarmWsConnection.java @@ -0,0 +1,139 @@ +package com.inspect.api.websocket; + +import com.inspect.api.domain.ApiResult; +import com.inspect.api.domain.AuthTokenData; +import com.inspect.api.props.AppProperties; +import com.inspect.api.service.ExtAuthService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.client.standard.StandardWebSocketClient; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import javax.annotation.PostConstruct; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; + +@Slf4j +@Component +public class AlarmWsConnection { + private final ExtAuthService extAuthService; + private final AppProperties appProperties; + private final StandardWebSocketClient wsClient; + + private final AtomicReference sessionRef = new AtomicReference<>(); + private final AtomicInteger reconnectBackoff = new AtomicInteger(5); + private volatile boolean connecting = false; + + public AlarmWsConnection(ExtAuthService extAuthService, AppProperties appProperties) { + this.extAuthService = extAuthService; + this.appProperties = appProperties; + this.wsClient = new StandardWebSocketClient(); + } + + @PostConstruct + public void init() { + connect(); + } + + public void connect() { + if (connecting) { + return; + } + connecting = true; + try { + ApiResult result = extAuthService.getAuthToken(); + if (!result.isSuccess() || result.getData() == null) { + log.error("Alarm WS: failed to get auth token, retry in {}s", reconnectBackoff.get()); + connecting = false; + return; + } + + String token = result.getData().getAccess_token(); + String wsUrl = appProperties.getWsUrl() + "?Joinbright-Token=" + token; + + wsClient.doHandshake(new AlarmWsHandler(), wsUrl) + .addCallback( + session -> { + sessionRef.set(session); + reconnectBackoff.set(5); + connecting = false; + log.info("Alarm WS connected: {}", session.getId()); + }, + ex -> { + connecting = false; + log.error("Alarm WS handshake failed: {}", ex.getMessage()); + } + ); + } catch (Exception e) { + connecting = false; + log.error("Alarm WS connect error: {}", e.getMessage()); + } + } + + @Scheduled(fixedDelay = 1000) + public void reconnect() { + WebSocketSession session = sessionRef.get(); + if (session != null && session.isOpen()) { + return; + } + if (connecting) { + return; + } + int delay = reconnectBackoff.get(); + log.info("Alarm WS reconnecting in {}s", delay); + try { + Thread.sleep(delay * 1000L); + } catch (InterruptedException ignored) { + Thread.currentThread().interrupt(); + return; + } + int nextDelay = Math.min(delay * 2, 60); + reconnectBackoff.set(nextDelay); + connect(); + } + + public boolean send(String message) { + WebSocketSession session = sessionRef.get(); + if (session == null || !session.isOpen()) { + log.warn("Alarm WS not connected, message dropped: {}", message); + return false; + } + try { + synchronized (session) { + session.sendMessage(new TextMessage(message)); + } + return true; + } catch (Exception e) { + log.error("Alarm WS send failed: {}", e.getMessage()); + return false; + } + } + + public boolean isConnected() { + WebSocketSession session = sessionRef.get(); + return session != null && session.isOpen(); + } + + private class AlarmWsHandler extends TextWebSocketHandler { + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { + log.warn("Alarm WS closed: {}", status); + sessionRef.compareAndSet(session, null); + } + + @Override + protected void handleTextMessage(WebSocketSession session, TextMessage message) { + log.info("Alarm WS received: {}", message.getPayload()); + } + + @Override + public void handleTransportError(WebSocketSession session, Throwable ex) { + log.error("Alarm WS transport error: {}", ex.getMessage()); + sessionRef.compareAndSet(session, null); + } + } +} diff --git a/inspect-main/inspect-main-start/src/main/resources/bootstrap.yaml b/inspect-main/inspect-main-start/src/main/resources/bootstrap.yaml index d6ae24d..ca8f1e1 100644 --- a/inspect-main/inspect-main-start/src/main/resources/bootstrap.yaml +++ b/inspect-main/inspect-main-start/src/main/resources/bootstrap.yaml @@ -6,15 +6,15 @@ server: spring: application: # 应用名称 - name: dliip-patrol + name: inspect-main profiles: # 环境配置 active: dev cloud: nacos: discovery: - server-addr: 192.168.0.115:8848 - namespace: 69445dc4-9c24-4814-ac93-ff14f1438c36 + server-addr: http://192.168.1.116:8848 + namespace: cf5b4192-f657-4012-b158-566325bae171 #server-addr: 192.168.0.114:8848 #namespace: 744b9c6a-5855-44cf-b537-808c0166d8f5 config: @@ -26,10 +26,10 @@ spring: group: DEFAULT_GROUP # 共享配置 shared-configs: - - dliip-patrol-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - inspect-main-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #dev-llc # namespace: 6b358531-5084-4f9c-84f2-f732d0b2af39 main: allow-bean-definition-overriding: true - allow-circular-references: true + allow-circular-references: true \ No newline at end of file