From 92cb9555f780beb3298d5d3a675433cfc1150131 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 18 三月 2025 16:08:47 +0800
Subject: [PATCH] 锂电设备A200相关代码更新
---
src/main/java/com/whyc/service/BattLithiumRtDataService.java | 2 +-
/dev/null | 6 ------
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200RtState.java | 2 +-
src/main/java/com/whyc/service/DevA200RtStateService.java | 10 +++++-----
src/main/java/com/whyc/mapper/DevA200RtStateMapper.java | 6 ++++++
src/main/java/com/whyc/service/DevLithiumInfService.java | 8 ++++----
src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java | 12 ++++++------
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/A200RealStateMapper.java b/src/main/java/com/whyc/mapper/A200RealStateMapper.java
deleted file mode 100644
index 9a20267..0000000
--- a/src/main/java/com/whyc/mapper/A200RealStateMapper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.db_lithium_ram_db.A200RealState;
-
-public interface A200RealStateMapper extends CustomMapper<A200RealState>{
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/DevA200RtStateMapper.java b/src/main/java/com/whyc/mapper/DevA200RtStateMapper.java
new file mode 100644
index 0000000..3267e8a
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/DevA200RtStateMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_lithium_ram_db.DevA200RtState;
+
+public interface DevA200RtStateMapper extends CustomMapper<DevA200RtState>{
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200RtState.java
similarity index 98%
rename from src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java
rename to src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200RtState.java
index cc82fdd..ab7b185 100644
--- a/src/main/java/com/whyc/pojo/db_lithium_ram_db/A200RealState.java
+++ b/src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200RtState.java
@@ -22,7 +22,7 @@
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_a200_realstate")
@ApiModel(value="A200Realstate瀵硅薄", description="A200 璁惧瀹炴椂鐘舵�佽〃")
-public class A200RealState implements Serializable {
+public class DevA200RtState implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/whyc/service/BattLithiumRtDataService.java b/src/main/java/com/whyc/service/BattLithiumRtDataService.java
index d76dae2..0ef333f 100644
--- a/src/main/java/com/whyc/service/BattLithiumRtDataService.java
+++ b/src/main/java/com/whyc/service/BattLithiumRtDataService.java
@@ -17,7 +17,7 @@
//鑾峰彇a200鐢垫睜缁勬暟鎹�
- public Response getA200RtdataState(int devId) {
+ public Response getA200RtDataState(int devId) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.orderByAsc("batt_idx");
diff --git a/src/main/java/com/whyc/service/A200RealStateService.java b/src/main/java/com/whyc/service/DevA200RtStateService.java
similarity index 70%
rename from src/main/java/com/whyc/service/A200RealStateService.java
rename to src/main/java/com/whyc/service/DevA200RtStateService.java
index cd27602..3c615f0 100644
--- a/src/main/java/com/whyc/service/A200RealStateService.java
+++ b/src/main/java/com/whyc/service/DevA200RtStateService.java
@@ -2,23 +2,23 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
-import com.whyc.mapper.A200RealStateMapper;
-import com.whyc.pojo.db_lithium_ram_db.A200RealState;
+import com.whyc.mapper.DevA200RtStateMapper;
+import com.whyc.pojo.db_lithium_ram_db.DevA200RtState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class A200RealStateService {
+public class DevA200RtStateService {
@Autowired(required = false)
- private A200RealStateMapper mapper;
+ private DevA200RtStateMapper mapper;
//涓�浣撴満A200瀹炴椂鏁版嵁
public Response getA200State(int devId) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- A200RealState a200state=mapper.selectOne(wrapper);
+ DevA200RtState a200state=mapper.selectOne(wrapper);
return new Response().setII(1,a200state!=null,a200state,"涓�浣撴満A200瀹炴椂鏁版嵁");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DevLithiumInfService.java b/src/main/java/com/whyc/service/DevLithiumInfService.java
index cd9f02c..be80ed8 100644
--- a/src/main/java/com/whyc/service/DevLithiumInfService.java
+++ b/src/main/java/com/whyc/service/DevLithiumInfService.java
@@ -7,11 +7,11 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.DevInfDto;
import com.whyc.dto.Response;
-import com.whyc.mapper.A200RealStateMapper;
+import com.whyc.mapper.DevA200RtStateMapper;
import com.whyc.mapper.ActmRealStateMapper;
import com.whyc.mapper.BattGroupBaojiGroupMapper;
import com.whyc.mapper.DevLithiumInfMapper;
-import com.whyc.pojo.db_lithium_ram_db.A200RealState;
+import com.whyc.pojo.db_lithium_ram_db.DevA200RtState;
import com.whyc.pojo.db_lithium_ram_db.ActmRealState;
import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import com.whyc.pojo.db_user.BattGroupBaojiGroup;
@@ -28,7 +28,7 @@
private DevLithiumInfMapper mapper;
@Autowired(required = false)
- private A200RealStateMapper a200Mapper;
+ private DevA200RtStateMapper a200Mapper;
@Autowired(required = false)
private ActmRealStateMapper actmMapper;
@@ -123,7 +123,7 @@
QueryWrapper a200wrapper= Wrappers.query();
a200wrapper.eq("dev_id",a200.getDevId());
a200wrapper.last("limit 1");
- A200RealState a200state=a200Mapper.selectOne(a200wrapper);
+ DevA200RtState a200state=a200Mapper.selectOne(a200wrapper);
//a200.setA200sTate(a200state);
a200.setState(a200state!=null?a200state:null);
}
diff --git a/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
index 70e2d90..44cef9b 100644
--- a/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
+++ b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java
@@ -3,7 +3,7 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.dto.RtStateDto;
-import com.whyc.service.A200RealStateService;
+import com.whyc.service.DevA200RtStateService;
import com.whyc.service.ActmRealStateService;
import com.whyc.service.BattLithiumRtDataService;
import com.whyc.service.WorkStateChangeEventService;
@@ -29,7 +29,7 @@
private static BattLithiumRtDataService battLithiumRtDataService;
- private static A200RealStateService a200RtStateService;
+ private static DevA200RtStateService devA200RtStateService;
private static ActmRealStateService actmRtStateService;
@@ -48,8 +48,8 @@
}
@Autowired
- public void setA200RealStateService(A200RealStateService a200RtStateService) {
- DevLithiumRtStateSocket.a200RtStateService = a200RtStateService;
+ public void setDevA200RtStateService(DevA200RtStateService devA200RtStateService) {
+ DevLithiumRtStateSocket.devA200RtStateService = devA200RtStateService;
}
@Autowired
@@ -124,8 +124,8 @@
//涓�浣撴満A200瀹炴椂鏁版嵁
private Response getA200State(int devId) {
Map<String, Response> map = new HashMap<>();
- Response resA200State=a200RtStateService.getA200State(devId);
- Response rtDataState= battLithiumRtDataService.getA200RtdataState(devId);
+ Response resA200State=devA200RtStateService.getA200State(devId);
+ Response rtDataState= battLithiumRtDataService.getA200RtDataState(devId);
Response event=eventService.getWorkEvent(devId);
map.put("resA200State",resA200State);
map.put("rtDataState",rtDataState);
--
Gitblit v1.9.1