diff --git a/analysis/stat/stat-api/pom.xml b/analysis/stat/stat-api/pom.xml
index b259d35..66c398a 100644
--- a/analysis/stat/stat-api/pom.xml
+++ b/analysis/stat/stat-api/pom.xml
@@ -22,11 +22,7 @@
common-core
${project.version}
-
- com.njcn
- common-db
- ${project.version}
-
+
com.njcn
common-microservice
diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
index 17ae40d..bea49c2 100644
--- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
+++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
@@ -40,22 +40,22 @@ public class BeanVConverter {
// dataV.setRmscaCp95();
//根据电压偏差正负赋值
- if (messageDataV.getDeltaV() >= 0) {
+ if (Objects.nonNull(messageDataV.getDeltaV())&&messageDataV.getDeltaV() >= 0) {
dataVRelation.setVlDev(messageDataV.getDeltaV());
} else {
dataVRelation.setVuDev(messageDataV.getDeltaV());
}
- if (messageDataV.getGDeltaV() >= 0) {
+ if (Objects.nonNull(messageDataV.getGDeltaV())&&messageDataV.getGDeltaV() >= 0) {
dataVRelation.setVlDevCp95(messageDataV.getGDeltaV());
} else {
dataVRelation.setVuDevCp95(messageDataV.getGDeltaV());
}
- if (messageDataV.getDeltaV() >= 0) {
+ if (Objects.nonNull(messageDataV.getMaxDeltaV())&&messageDataV.getMaxDeltaV() >= 0) {
dataVRelation.setVlDevMax(messageDataV.getDeltaV());
} else {
dataVRelation.setVuDevMax(messageDataV.getDeltaV());
}
- if (messageDataV.getDeltaV() >= 0) {
+ if (Objects.nonNull(messageDataV.getMinDeltaV())&&messageDataV.getMinDeltaV() >= 0) {
dataVRelation.setVlDevMin(messageDataV.getDeltaV());
} else {
dataVRelation.setVuDevMin(messageDataV.getDeltaV());
diff --git a/analysis/stat/stat-boot/pom.xml b/analysis/stat/stat-boot/pom.xml
index 2eb02bd..03e70dc 100644
--- a/analysis/stat/stat-boot/pom.xml
+++ b/analysis/stat/stat-boot/pom.xml
@@ -33,11 +33,6 @@
common-swagger
${project.version}
-
- org.mybatis
- mybatis-spring
- 2.0.5
-
com.njcn.platform
message-api
@@ -49,18 +44,26 @@
data-processing-api
1.0.0
compile
+
+
+ common-db
+ com.njcn
+
+
com.njcn.platform
stat-api
1.0.0
compile
+
+
+ common-db
+ com.njcn
+
+
-
- com.baomidou
- dynamic-datasource-spring-boot-starter
- 3.5.1
-
+
diff --git a/message/message-api/pom.xml b/message/message-api/pom.xml
index 375d73e..c08524a 100644
--- a/message/message-api/pom.xml
+++ b/message/message-api/pom.xml
@@ -23,11 +23,6 @@
common-core
${project.version}
-
- com.njcn
- common-db
- ${project.version}
-
com.njcn
common-microservice
diff --git a/message/message-boot/pom.xml b/message/message-boot/pom.xml
index 178b937..3a60588 100644
--- a/message/message-boot/pom.xml
+++ b/message/message-boot/pom.xml
@@ -33,26 +33,6 @@
common-swagger
${project.version}
-
- org.mybatis
- mybatis-spring
- 2.0.5
-
-
- com.njcn
- common-swagger
- ${project.version}
-
-
- com.njcn
- common-core
- ${project.version}
-
-
- com.njcn
- common-db
- ${project.version}
-
com.njcn
common-redis
@@ -64,11 +44,11 @@
rocket-mq-springboot-starter
1.0.0
-
- com.baomidou
- dynamic-datasource-spring-boot-starter
- 3.5.1
-
+
+
+
+
+
com.njcn.platform
message-api
@@ -78,6 +58,12 @@
com.njcn.platform
stat-api
1.0.0
+
+
+ common-db
+ com.njcn
+
+
com.njcn.platform
@@ -89,17 +75,21 @@
rt-api
1.0.0
-
- com.njcn
- pq-device-api
- 1.0.0
-
-
- pqs-influx
- com.njcn
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.springframework.boot
spring-boot-starter-websocket
diff --git a/message/message-boot/src/main/java/com/njcn/message/websocket/WebSocketServer.java b/message/message-boot/src/main/java/com/njcn/message/websocket/WebSocketServer.java
index 0a84ee7..837a125 100644
--- a/message/message-boot/src/main/java/com/njcn/message/websocket/WebSocketServer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/websocket/WebSocketServer.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
@Slf4j
@Component
-@ServerEndpoint(value ="/api/pushMessage/{userIdAndlineId}")
+@ServerEndpoint(value ="/api/pushMessage/{userIdAndLineIdAndDevId}")
public class WebSocketServer {
@@ -46,13 +46,13 @@ public class WebSocketServer {
}
- private static LineFeignClient lineFeignClient;
-
- // 注入的时候，给类的 service 注入
- @Autowired
- public void setLineFeignClient(LineFeignClient lineFeignClient) {
- WebSocketServer.lineFeignClient = lineFeignClient;
- }
+// private static LineFeignClient lineFeignClient;
+//
+// // 注入的时候，给类的 service 注入
+// @Autowired
+// public void setLineFeignClient(LineFeignClient lineFeignClient) {
+// WebSocketServer.lineFeignClient = lineFeignClient;
+// }
/**
* 静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。
*/
@@ -68,24 +68,24 @@ public class WebSocketServer {
/**
* 接收userId
*/
- private String userIdAndlineId = "";
+ private String userIdAndLineIdAndDevId = "";
/**
* 连接建立成
* 功调用的方法
*/
@OnOpen
- public void onOpen(Session session, @PathParam("userIdAndlineId") String userIdAndlineId) {
- //lineId 是 userid+","+lineId
+ public void onOpen(Session session, @PathParam("userIdAndLineIdAndDevId") String userIdAndLineIdAndDevId) {
+ //lineId 是 userid+","+lineId+","+Devid
this.session = session;
- this.userIdAndlineId = userIdAndlineId;
- if (webSocketMap.containsKey(userIdAndlineId)) {
- webSocketMap.remove(userIdAndlineId);
+ this.userIdAndLineIdAndDevId = userIdAndLineIdAndDevId;
+ if (webSocketMap.containsKey(userIdAndLineIdAndDevId)) {
+ webSocketMap.remove(userIdAndLineIdAndDevId);
//加入set中
- webSocketMap.put(userIdAndlineId, this);
+ webSocketMap.put(userIdAndLineIdAndDevId, this);
} else {
//加入set中
- webSocketMap.put(userIdAndlineId, this);
+ webSocketMap.put(userIdAndLineIdAndDevId, this);
//在线数加1
addOnlineCount();
}
@@ -100,12 +100,12 @@ public class WebSocketServer {
*/
@OnClose
public void onClose() {
- if (webSocketMap.containsKey(userIdAndlineId)) {
- webSocketMap.remove(userIdAndlineId);
+ if (webSocketMap.containsKey(userIdAndLineIdAndDevId)) {
+ webSocketMap.remove(userIdAndLineIdAndDevId);
//从set中删除
subOnlineCount();
}
- log.info("监测点退出:" + userIdAndlineId + ",当前在线监测点数为:" + getOnlineCount());
+ log.info("监测点退出:" + userIdAndLineIdAndDevId + ",当前在线监测点数为:" + getOnlineCount());
}
/**
@@ -117,20 +117,20 @@ public class WebSocketServer {
@OnMessage
public void onMessage(String message, Session session) {
//会每30s发送请求1次
- log.info("监测点消息:" + userIdAndlineId + ",报文:" + message);
+ log.info("监测点消息:" + userIdAndLineIdAndDevId + ",报文:" + message);
AskRealDataMessage askRealDataMessage = new AskRealDataMessage();
- String[] split = userIdAndlineId.split(",");
+ String[] split = userIdAndLineIdAndDevId.split(",");
askRealDataMessage.setLine(split[1]);
//测试设备187
// askRealDataMessage.setDevSeries("fed656b21f89abb06204e8e4dc6c375a");
- LineDetailDataVO data = lineFeignClient.getLineDetailData(split[1]).getData();
- askRealDataMessage.setDevSeries(data.getDevId());
+// LineDetailDataVO data = lineFeignClient.getLineDetailData(split[1]).getData();
+ askRealDataMessage.setDevSeries(split[2]);
BaseMessage baseMessage = new BaseMessage();
baseMessage.setMessageBoy(JSONObject.toJSONString(askRealDataMessage));
// 发送消息到topic1
askRealDataMessaggeTemplate.sendMember(baseMessage);
redisUtil.saveByKey("AskRealData:".concat(split[1]),"AskRealData:".concat(split[1]));
- log.info("监测点连接:" + userIdAndlineId + ",当前在线监测点数为:" + getOnlineCount());
+ log.info("监测点连接:" + userIdAndLineIdAndDevId + ",当前在线监测点数为:" + getOnlineCount());
}
@@ -142,7 +142,7 @@ public class WebSocketServer {
@OnError
public void onError(Session session, Throwable error) {
- log.error("监测点错误:" + this.userIdAndlineId + ",原因:" + error.getMessage());
+ log.error("监测点错误:" + this.userIdAndLineIdAndDevId + ",原因:" + error.getMessage());
error.printStackTrace();
}