From 6535848ee32870ec2b0873c1d90ab2157b6908e3 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 13 六月 2025 16:54:50 +0800
Subject: [PATCH] 站点信息统计,电池品牌信息统计
---
src/main/java/com/whyc/service/StationInfService.java | 9 +++-
src/main/resources/mapper/PowerInfMapper.xml | 8 ++++
src/main/java/com/whyc/webSocket/LeaderHomeSocket.java | 9 ++--
src/main/java/com/whyc/mapper/PowerInfMapper.java | 3 +
src/main/java/com/whyc/service/PowerInfService.java | 4 ++
src/main/java/com/whyc/dto/NameValueDto.java | 20 ++++++++++
src/main/resources/mapper/StationInfMapper.xml | 8 ++++
src/main/java/com/whyc/mapper/StationInfMapper.java | 3 +
8 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/dto/NameValueDto.java b/src/main/java/com/whyc/dto/NameValueDto.java
new file mode 100644
index 0000000..de1f8d6
--- /dev/null
+++ b/src/main/java/com/whyc/dto/NameValueDto.java
@@ -0,0 +1,20 @@
+package com.whyc.dto;
+
+import lombok.Data;
+import lombok.ToString;
+
+@ToString
+@Data
+public class NameValueDto {
+
+ private String name;
+ private String value;
+
+ public NameValueDto() {
+ }
+
+ public NameValueDto(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+}
diff --git a/src/main/java/com/whyc/mapper/PowerInfMapper.java b/src/main/java/com/whyc/mapper/PowerInfMapper.java
index 598ed76..843e85a 100644
--- a/src/main/java/com/whyc/mapper/PowerInfMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerInfMapper.java
@@ -31,4 +31,7 @@
//浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)
List<PowerInf> getPwr7Statistic(@Param("stic") Pwr7Stic stic);
+
+ List<PowerInf> getListByUserId(Integer userId);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/StationInfMapper.java b/src/main/java/com/whyc/mapper/StationInfMapper.java
index 7d25a57..23e2b2b 100644
--- a/src/main/java/com/whyc/mapper/StationInfMapper.java
+++ b/src/main/java/com/whyc/mapper/StationInfMapper.java
@@ -27,4 +27,7 @@
List<String> getStationTypeByUid(@Param("uid") Integer uid);
//绔欑偣淇℃伅缁熻
List<StationInf> getStationStatistic(@Param("stic") StationStic stic);
+
+ List<StationInf> getListByUserId(Integer userId);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 8441058..919e4d7 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -153,4 +153,8 @@
public List<PowerInf> getPwr7Statistic(Pwr7Stic stic) {
return mapper.getPwr7Statistic(stic);
}
+
+ public List<PowerInf> getListByUserId(Integer userId) {
+ return mapper.getListByUserId(userId);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/StationInfService.java b/src/main/java/com/whyc/service/StationInfService.java
index bfc522e..e7c3953 100644
--- a/src/main/java/com/whyc/service/StationInfService.java
+++ b/src/main/java/com/whyc/service/StationInfService.java
@@ -1,7 +1,6 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -58,7 +57,7 @@
return new Response().setII(1,list.size()>0,list,"鑾峰彇鐢靛帇绛夌骇(涓嬫媺)");
}
- public List<StationInf> getAllWithFields(String... fields) {
+ /*public List<StationInf> getAllWithFields(Integer userId, String... fields) {
QueryWrapper<StationInf> query = Wrappers.query();
StringBuilder fieldsStr = new StringBuilder();
//瀵筬ields杩涜鎷兼帴,鎷兼帴涓簊elect
@@ -73,7 +72,7 @@
return mapper.selectList(query);
- }
+ }*/
//绔欑偣淇℃伅缁熻
public Response getStationStatistic(StationStic stic) {
PageHelper.startPage(stic.getPageNum(),stic.getPageSize());
@@ -89,4 +88,8 @@
StationInf sinf=mapper.selectOne(wrapper);
return sinf;
}
+
+ public List<StationInf> getListByUserId(Integer userId) {
+ return mapper.getListByUserId(userId);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/webSocket/LeaderHomeSocket.java b/src/main/java/com/whyc/webSocket/LeaderHomeSocket.java
index 6d7bd0c..b61f47b 100644
--- a/src/main/java/com/whyc/webSocket/LeaderHomeSocket.java
+++ b/src/main/java/com/whyc/webSocket/LeaderHomeSocket.java
@@ -2,8 +2,8 @@
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
+import com.whyc.pojo.db_user.User;
import com.whyc.service.LeaderHomeService;
-import com.whyc.service.LoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -11,8 +11,6 @@
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
/**
* 棰嗗灞傞椤�
@@ -36,13 +34,14 @@
public void onOpen(Session session, EndpointConfig config){
this.session = session;
HttpSession httpSession = (HttpSession) config.getUserProperties().get("httpSession");
-
+ User user = (User) httpSession.getAttribute("user");
+ Integer userId = user.getId();
Thread thread = new Thread() {
@Override
public void run() {
try {
while (!currentThread().isInterrupted()) {
- Response response = leaderHomeService.getAll();
+ Response response = leaderHomeService.getAll(userId);
session.getBasicRemote().sendObject(new Response().set(1, response));
sleep(4000);
}
diff --git a/src/main/resources/mapper/PowerInfMapper.xml b/src/main/resources/mapper/PowerInfMapper.xml
index 8bdef81..b730e21 100644
--- a/src/main/resources/mapper/PowerInfMapper.xml
+++ b/src/main/resources/mapper/PowerInfMapper.xml
@@ -161,5 +161,13 @@
order by tb_power_inf.power_id asc
</where>
</select>
+ <select id="getListByUserId" resultType="com.whyc.pojo.db_station.PowerInf">
+ select distinct * from db_station.tb_power_inf
+ where tb_power_inf.power_id in(
+ select distinct power_id from db_user.tb_baojigroup_usr bu,db_user.tb_baojigroup_power bp
+ where bu.baoji_group_id = bp.baoji_group_id
+ and bu.uid = #{userId}
+ )
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/StationInfMapper.xml b/src/main/resources/mapper/StationInfMapper.xml
index f42f909..058e4fb 100644
--- a/src/main/resources/mapper/StationInfMapper.xml
+++ b/src/main/resources/mapper/StationInfMapper.xml
@@ -207,5 +207,13 @@
order by station_id asc
</where>
</select>
+ <select id="getListByUserId" resultType="com.whyc.pojo.db_station.StationInf">
+ select distinct * from db_station.tb_station_inf
+ where tb_station_inf.station_id in(
+ select distinct station_id from db_user.tb_baojigroup_usr bu,db_user.tb_baojigroup_power bp
+ where bu.baoji_group_id = bp.baoji_group_id
+ and bu.uid = #{userId}
+ )
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1