From c3828aba777f494f4c0f05d0e4f88488e1f64115 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 26 九月 2023 10:09:16 +0800
Subject: [PATCH] 删除大屏 mq
---
hd/pipe/mobile/src/main/resources/application-pro.yml | 2 --
/dev/null | 16 ----------------
hd/pipe/ProjectManage/src/main/resources/application-pro.yml | 2 --
hd/pipe/gateway/src/main/resources/application-pro.yml | 2 --
4 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-pro.yml b/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
index 53ecd16..f1dacbe 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
@@ -1,5 +1,3 @@
-server:
- port: 8883
spring:
config:
activate:
diff --git a/hd/pipe/gateway/src/main/resources/application-pro.yml b/hd/pipe/gateway/src/main/resources/application-pro.yml
index e869bbb..69539a7 100644
--- a/hd/pipe/gateway/src/main/resources/application-pro.yml
+++ b/hd/pipe/gateway/src/main/resources/application-pro.yml
@@ -1,5 +1,3 @@
-server:
- port: 8880
spring:
cloud:
nacos:
diff --git a/hd/pipe/mobile/src/main/resources/application-pro.yml b/hd/pipe/mobile/src/main/resources/application-pro.yml
index 499b9ce..f1dacbe 100644
--- a/hd/pipe/mobile/src/main/resources/application-pro.yml
+++ b/hd/pipe/mobile/src/main/resources/application-pro.yml
@@ -1,5 +1,3 @@
-server:
- port: 8884
spring:
config:
activate:
diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/config/MqttClientConfig.java b/hd/pipe/screen/src/main/java/com/thhy/screen/config/MqttClientConfig.java
deleted file mode 100644
index 68f26e0..0000000
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/config/MqttClientConfig.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.thhy.screen.config;
-
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MqttClientConfig {
-
- private Logger logger = LoggerFactory.getLogger("MQTT初始化");
-
- @Bean
- public MqttClient createClient(MqttConfig mqttConfig){
- MemoryPersistence persistence = new MemoryPersistence();
- MqttClient client = null;
- try {
- client = new MqttClient(mqttConfig.getBroker(), mqttConfig.getClientId(), persistence);
- } catch (MqttException e) {
- logger.error("MQTT客户端初始化错误");
- return null;
- }
- logger.error("MQTT客户端初始化正常");
- MqttConnectOptions connOpts = new MqttConnectOptions();
- connOpts.setUserName(mqttConfig.getUsername());
- connOpts.setPassword(mqttConfig.getPassword().toCharArray());
- // 保留会话
- connOpts.setCleanSession(true);
-
- // 设置回调
- client.setCallback(new OnMqttCallBack());
-
- try {
- client.connect(connOpts);
- } catch (MqttException e) {
- logger.error("MQTT客户端连接出现错误"+e.getMessage());
- return client;
- }
- logger.error("MQTT客户端连接成功");
- // 订阅
- try {
- client.subscribe(mqttConfig.getSubTopic());
- logger.error("MQTT客户端订阅["+mqttConfig.getSubTopic()+"]成功");
- } catch (MqttException e) {
- logger.error("MQTT客户端订阅["+mqttConfig.getSubTopic()+"]失败"+e.getMessage());
- return client;
- }
- return client;
- }
-}
diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/config/MqttConfig.java b/hd/pipe/screen/src/main/java/com/thhy/screen/config/MqttConfig.java
deleted file mode 100644
index 40e872e..0000000
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/config/MqttConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.thhy.screen.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "mqtt")
-@Data
-public class MqttConfig {
-
- private String pubTopic;
-
- private String subTopic;
-
- private String broker;
-
- private String clientId;
-
- private String username;
-
- private String password;
-}
diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/config/OnMqttCallBack.java b/hd/pipe/screen/src/main/java/com/thhy/screen/config/OnMqttCallBack.java
deleted file mode 100644
index 8a68fc4..0000000
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/config/OnMqttCallBack.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.thhy.screen.config;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.thhy.general.common.BasicResult;
-import com.thhy.general.common.enums.ProListenType;
-import com.thhy.screen.modules.biz.agv.entity.AgvStateHistory;
-import com.thhy.screen.modules.biz.agv.mapper.AgvStateHistoryMapper;
-import com.thhy.screen.modules.biz.bigscreen.controller.ProListenSocketServer;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.redisson.api.RedissonClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.Session;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-@Component
-public class OnMqttCallBack implements MqttCallback {
-
- private Logger logger = LoggerFactory.getLogger("Mqtt-jianting");
-
- @Autowired
- private RedissonClient redissonClient;
-
- @Autowired
- private AgvStateHistoryMapper historyMapper;
-
- @Override
- public void connectionLost(Throwable throwable) {
- System.out.println("丢失连接");
- }
-
- @Override
- public void messageArrived(String s, MqttMessage mqttMessage) throws Exception {
- System.out.println(s+"================="+mqttMessage.toString());
- System.out.println(s+"================="+mqttMessage.toString());
- logger.info("接收到数据"+mqttMessage.toString());
- /*if("agvmqtt".equals(s)){
- CopyOnWriteArraySet<Session> SESSIONS = ProListenSocketServer.SESSIONS;
- SESSIONS.forEach(session ->{
- try {
- List<JSONObject> jsonObjectList = new ArrayList<>();
- JSONObject jsonObject = JSON.parseObject(mqttMessage.toString());
- AgvStateHistory agvStateHistory = JSON.parseObject(mqttMessage.toString(),AgvStateHistory.class);
- historyMapper.insert(agvStateHistory);
- logger.info("保存成功"+mqttMessage.toString());
- jsonObject.put("mod", ProListenType.AGVINFO);
- jsonObjectList.add(jsonObject);
- if (session.isOpen()) {
- session.getBasicRemote().sendText(JSON.toJSONString(BasicResult.success(jsonObjectList)));
- logger.info("成功推送AGV消息到生产监控大屏"+session.getId()+"___"+session.getRequestURI().getHost());
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- });
- }*/
- }
-
- @Override
- public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
- System.out.println("sssss");
- }
-}
diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/agv/controller/test.java b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/agv/controller/test.java
deleted file mode 100644
index 6994d89..0000000
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/agv/controller/test.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.thhy.screen.modules.biz.agv.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.thhy.screen.modules.biz.agv.entity.AgvStateHistory;
-
-public class test {
- public static void main(String[] args) {
- String mess = "agv/tcb01/agvState{\"agvBaseAngularVel\": 0.0, \"errorCode\": 0, \"battery1Current\": 2.3, \"accurateStop\": 0, \"agvVelLevel\": \"3\", \"battery1Charge\": 96.5, \"agvModelRFID\": -1, \"agvControlStyle\": \"manu\", \"battery1ErrorCode\": 0, \"agvDestRFID\": -1, \"agvVelDirection\": \"stop\", \"agvBaseLinearVel\": 0.0, \"agvBackLaserSwitch\": 0, \"agvWorkingState\": \"idle\", \"agvLiftupHeavyState\": \"heavyNoExistence\", \"errorContent\": \"\\u624b\\u52a8\\u63a7\\u5236\\uff0c\\u72b6\\u6001\\u826f\\u597d\", \"agvId\": \"tcb01\", \"agvFrontLaserSwitch\": 0, \"agvTaskState\": \"idle\", \"agvCollision\": 0, \"agvEmergencyButton\": 0, \"agvCurrentLandmarkRFID\": -1, \"agvMoveStyle\": \"longtitude\", \"battery1Voltage\": 53.3, \"agvJackingState\": \"jackingDown\"}";
-
- mess = mess.substring(mess.indexOf("{"),mess.indexOf("}")+1);
-
- AgvStateHistory agvStateHistory = JSON.parseObject(mess,AgvStateHistory.class);
-
- System.out.printf(mess);
- }
-}
--
Gitblit v1.9.3