diff --git a/pom.xml b/pom.xml index 90833a4..fe75c10 100644 --- a/pom.xml +++ b/pom.xml @@ -34,23 +34,10 @@ test - org.springframework.boot - spring-boot-starter-websocket - 1.5.6.RELEASE - - org.apache.commons commons-pool2 2.4.2 - org.springframework.boot @@ -102,11 +89,6 @@ 5.0.0 - org.springframework.boot - spring-boot-starter-data-mongodb - - - org.springframework.data spring-data-commons 2.1.5.RELEASE diff --git a/src/main/java/com/objecteye/config/RabbitmqConfig.java b/src/main/java/com/objecteye/config/RabbitmqConfig.java deleted file mode 100644 index 1355bb8..0000000 --- a/src/main/java/com/objecteye/config/RabbitmqConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.objecteye.config; - - -import org.springframework.amqp.core.*; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - - -@Configuration -public class RabbitmqConfig { - public static final String QUEUE_INFORM_LISTENER = "queue_inform_listener"; - - public static final String EXCHANGE_TOPICS_INFORM="exchange_topics_inform"; - - /** - * - * 配置交换机 - * ExchangeBuilder提供了fonout，direct，topic，header的交换机的配置 - * @return - */ - @Bean(EXCHANGE_TOPICS_INFORM) - public Exchange EXCHANGE_TOPICS_INFORM(){ - return ExchangeBuilder.topicExchange(EXCHANGE_TOPICS_INFORM).durable(true).build(); - } - - /** - * 声明队列 - * @return - */ - @Bean(QUEUE_INFORM_LISTENER) - public Queue QUEUE_INFORM_STORE(){ - return new Queue(QUEUE_INFORM_LISTENER); - } - - //绑定队列到交换机 - @Bean - public Binding BINDING_QUEUE_INFORM_STORE(@Qualifier(QUEUE_INFORM_LISTENER) Queue queue, @Qualifier(EXCHANGE_TOPICS_INFORM)Exchange exchange){ - return BindingBuilder.bind(queue).to(exchange).with("inform.#.listener.#").noargs(); - } -} diff --git a/src/main/java/com/objecteye/config/Swagger2Config.java b/src/main/java/com/objecteye/config/Swagger2Config.java index 5001260..1e02280 100644 --- a/src/main/java/com/objecteye/config/Swagger2Config.java +++ b/src/main/java/com/objecteye/config/Swagger2Config.java @@ -37,9 +37,9 @@ public class Swagger2Config { private ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("人像平台后台系统") - .description("人像平台后台模块") - .contact("face") + .title("引擎可视化") + .description("引擎可视化") + .contact("remoteListener") .version("1.0") .build(); } @@ -55,17 +55,10 @@ public class Swagger2Config { private List securityContexts() { //设置需要登录认证的路径 List result = new ArrayList<>(); - result.add(getContextByPath("/alarm/.*")); - result.add(getContextByPath("/capture/.*")); - result.add(getContextByPath("/deploy/.*")); - result.add(getContextByPath("/equipment/.*")); - result.add(getContextByPath("/feature/.*")); - result.add(getContextByPath("/location/.*")); - result.add(getContextByPath("/personnel/.*")); - result.add(getContextByPath("/preview/.*")); - result.add(getContextByPath("/record/.*")); + result.add(getContextByPath("/background/.*")); + result.add(getContextByPath("/logListener/.*")); + result.add(getContextByPath("/occupationOfBasicResources/.*")); result.add(getContextByPath("/user/.*")); - result.add(getContextByPath("/areaEquipment/.*")); return result; } diff --git a/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java b/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java deleted file mode 100644 index a2b89f7..0000000 --- a/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.objecteye.utils; - -import com.objecteye.config.RabbitmqConfig; -import com.rabbitmq.client.Channel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.stereotype.Component; - -@Component -public class RabbbitmqConsumer { - - private final static Logger logger = LoggerFactory.getLogger(RabbbitmqConsumer.class); - - @RabbitListener(queues = {RabbitmqConfig.QUEUE_INFORM_LISTENER}) - public void receive_store(String msg, Message message, Channel channel) { - logger.info(msg); - } -} diff --git a/src/main/java/com/objecteye/websocket/MyHandshakeInterceptor.java b/src/main/java/com/objecteye/websocket/MyHandshakeInterceptor.java deleted file mode 100644 index 74052c6..0000000 --- a/src/main/java/com/objecteye/websocket/MyHandshakeInterceptor.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.objecteye.websocket; - -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServerHttpResponse; -import org.springframework.http.server.ServletServerHttpRequest; -import org.springframework.stereotype.Component; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.HandshakeInterceptor; - -import java.util.Map; - -/** - * @Author: lr - * @Date: 2019/9/5 14:32 - * @Version 1.0 - * @Message: - */ -@Component -public class MyHandshakeInterceptor implements HandshakeInterceptor { - @Override - public boolean beforeHandshake(ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse, WebSocketHandler webSocketHandler, Map map) throws Exception { - String deviceId=((ServletServerHttpRequest)serverHttpRequest).getServletRequest().getParameter("deviceId"); - if(deviceId!=null){ - map.put("deviceId",deviceId); - } - return true; - } - - @Override - public void afterHandshake(ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse, WebSocketHandler webSocketHandler, Exception e) { - } -} diff --git a/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java b/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java deleted file mode 100644 index 7a46462..0000000 --- a/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.objecteye.websocket; - -import net.sf.json.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -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.handler.TextWebSocketHandler; - - -/** - * @Author: lr - * @Date: 2019/9/3 10:45 - * @Version 1.0 - * @Message: - */ -@Component -public class MyWebSocketHandler extends TextWebSocketHandler { - - @Autowired - private RedisTemplate redisTemplate; - - - - @Override - public void handleTextMessage(WebSocketSession session, TextMessage message) - throws Exception { - super.handleTextMessage(session, message); - } - - /** - * 抓拍数据和报警数据的json格式 - */ - public String getRealData(Object countMsg, Object captureMsg, Object deployAlarmMsg) { - JSONObject jsonObject = new JSONObject(); - boolean isNull = true; - if (countMsg != null) { - isNull = false; - jsonObject.put("countMsg", countMsg); - jsonObject.put("countCode", 0); - } else { - jsonObject.put("countCode", 1); - } - if (captureMsg != null) { - isNull = false; - jsonObject.put("captureMsg", captureMsg); - jsonObject.put("captureCode", 0); - } else { - jsonObject.put("captureCode", 1); - } - if (deployAlarmMsg != null) { - isNull = false; - jsonObject.put("deployAlarmMsg", deployAlarmMsg); - jsonObject.put("deployAlarmCode", 0); - } else { - jsonObject.put("deployAlarmCode", 1); - } - if (isNull) { - return null; - } - return jsonObject.toString(); - } - - - @Override - public void afterConnectionEstablished(WebSocketSession session) { - - } - - //抛出异常后处理 - @Override - public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception { - if (session.isOpen()) { - session.close(); - } - } - - @Override - public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception { - if(session.isOpen()){ - session.close(); - } - } -} diff --git a/src/main/java/com/objecteye/websocket/WebSocketConfigClass.java b/src/main/java/com/objecteye/websocket/WebSocketConfigClass.java deleted file mode 100644 index 04c1c9b..0000000 --- a/src/main/java/com/objecteye/websocket/WebSocketConfigClass.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.objecteye.websocket; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; - -/** - * @Author: lr - * @Date: 2019/9/3 10:51 - * @Version 1.0 - * @Message: - */ -@Configuration -@EnableWebSocket -public class WebSocketConfigClass implements WebSocketConfigurer { - - @Autowired - private MyHandshakeInterceptor myHandshakeInterceptor; - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(myHandler(),"/ws").setAllowedOrigins("*").addInterceptors(this.myHandshakeInterceptor); - } - - @Bean - public WebSocketHandler myHandler(){ - return new MyWebSocketHandler(); - } -}