From ed96173f09f9bf2898e679f22094c9149216e7af Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 03 四月 2025 15:44:52 +0800
Subject: [PATCH] abe状态
---
src/main/java/com/whyc/service/AbeInfService.java | 25 +++++++++++++++++++++++++
src/main/java/com/whyc/webSocket/AbeStateSocket.java | 12 +++++++++++-
src/main/java/com/whyc/mapper/AbeInfMapper.java | 6 ++++++
src/main/java/com/whyc/service/AbeRamService.java | 3 ++-
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/AbeInfMapper.java b/src/main/java/com/whyc/mapper/AbeInfMapper.java
new file mode 100644
index 0000000..e2f7a15
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/AbeInfMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_abe_ram.AbeInf;
+
+public interface AbeInfMapper extends CustomMapper<AbeInf> {
+}
diff --git a/src/main/java/com/whyc/service/AbeInfService.java b/src/main/java/com/whyc/service/AbeInfService.java
new file mode 100644
index 0000000..d2bd0e6
--- /dev/null
+++ b/src/main/java/com/whyc/service/AbeInfService.java
@@ -0,0 +1,25 @@
+package com.whyc.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.whyc.dto.Response;
+import com.whyc.mapper.AbeInfMapper;
+import com.whyc.mapper.AbeStateMapper;
+import com.whyc.pojo.db_abe_ram.AbeInf;
+import com.whyc.pojo.db_abe_ram.AbeState;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class AbeInfService {
+
+ @Resource
+ private AbeInfMapper mapper;
+
+ public AbeInf get() {
+ QueryWrapper<AbeInf> query = Wrappers.query();
+ query.last(" limit 1");
+ return mapper.selectOne(query);
+ }
+}
diff --git a/src/main/java/com/whyc/service/AbeRamService.java b/src/main/java/com/whyc/service/AbeRamService.java
index abe8177..38e7d2e 100644
--- a/src/main/java/com/whyc/service/AbeRamService.java
+++ b/src/main/java/com/whyc/service/AbeRamService.java
@@ -15,8 +15,9 @@
@Resource
private AbeRamMapper mapper;
- public Response<AbeRam> get() {
+ public Response<AbeRam> get(Integer abeMonId) {
QueryWrapper<AbeRam> query = Wrappers.query();
+ query.eq("mon_id",abeMonId);
query.last(" limit 1");
AbeRam abeRam = mapper.selectOne(query);
return new Response<AbeRam>().set(1,abeRam);
diff --git a/src/main/java/com/whyc/webSocket/AbeStateSocket.java b/src/main/java/com/whyc/webSocket/AbeStateSocket.java
index 3dd9326..1dd4308 100644
--- a/src/main/java/com/whyc/webSocket/AbeStateSocket.java
+++ b/src/main/java/com/whyc/webSocket/AbeStateSocket.java
@@ -3,8 +3,10 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.PageAlarm;
import com.whyc.dto.Response;
+import com.whyc.pojo.db_abe_ram.AbeInf;
import com.whyc.pojo.db_abe_ram.AbeRam;
import com.whyc.pojo.db_abe_ram.AbeState;
+import com.whyc.service.AbeInfService;
import com.whyc.service.AbeRamService;
import com.whyc.service.AbeStateService;
import com.whyc.service.BattStationTempAlarmService;
@@ -28,6 +30,8 @@
private Thread thread;
+ private static AbeInfService infService;
+
private static AbeRamService ramService;
private static AbeStateService stateService;
@@ -48,6 +52,11 @@
AbeStateSocket.stateService = stateService;
}
+ @Autowired
+ public void setInfService(AbeInfService infService) {
+ AbeStateSocket.infService = infService;
+ }
+
@OnOpen
public void onOpen(Session session, EndpointConfig config) {
this.session = session;
@@ -61,8 +70,9 @@
if (session.isOpen()) {
//鎺ㄩ�佷俊鎭�
synchronized (session) {
+ AbeInf inf = infService.get();
Response<AbeState> state = stateService.get();
- Response<AbeRam> ram = ramService.get();
+ Response<AbeRam> ram = ramService.get(inf.getAbeMonId());
Map<String, Response> resMap = new HashMap<>();
resMap.put("state",state);
resMap.put("ram",ram);
--
Gitblit v1.9.1