From 35bd0babece513b6ee4285265f3379cbcb050e59 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 08 五月 2025 11:17:39 +0800
Subject: [PATCH] 苏州推送修改
---
src/main/java/com/whyc/service/BattRtstateService.java | 4 ++--
src/main/java/com/whyc/service/BattalarmDataService.java | 4 +---
src/main/resources/mapper/BattRtstateMapper.xml | 15 ++++++++-------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRtstateService.java b/src/main/java/com/whyc/service/BattRtstateService.java
index 2156830..f9fa87b 100644
--- a/src/main/java/com/whyc/service/BattRtstateService.java
+++ b/src/main/java/com/whyc/service/BattRtstateService.java
@@ -147,12 +147,12 @@
Map<String,Integer> allTypemap=new HashMap<>();
//setDefalut(map);
try {
- //鏌ヨ鐢垫睜鐘舵��
+ //鏌ヨ鐢垫睜鐘舵��(鍘婚櫎鏈煡)
List<BattRtstate> list=battRtstateMapper.getAllBattStateInSz2(userId);
Map<String, List<BattRtstate>> ListMap = list.stream().collect(Collectors.groupingBy(BattRtstate::getStationName9));
for (String stationName9 : ListMap.keySet()) {
Map<String, Object> battInfoMap = new HashMap<>();
- battInfoMap.put("鏈煡",0);
+ //battInfoMap.put("鏈煡",0);
battInfoMap.put("娴厖",0);
battInfoMap.put("鍏呯數",0);
battInfoMap.put("鏀剧數",0);
diff --git a/src/main/java/com/whyc/service/BattalarmDataService.java b/src/main/java/com/whyc/service/BattalarmDataService.java
index e8fefd5..665d149 100644
--- a/src/main/java/com/whyc/service/BattalarmDataService.java
+++ b/src/main/java/com/whyc/service/BattalarmDataService.java
@@ -1179,12 +1179,11 @@
Map<Integer,Integer> allLevelmap=new HashMap<>();
Map<String,Integer> allTypemap=new HashMap<>();
Map<String,List<BattalarmData>> listmap=new HashMap<>();
- Map<String,List<BattalarmData>> allListmap=new HashMap<>();
//setDefalut(map);
try {
//鏌ヨb鎵�鏈夊疄鏃剁數姹犲憡璀︿俊鎭�
List<BattalarmData> list=mapper.getAllBattAlarmInSz2(userId);
- allListmap.put("allList",list.stream().limit(10).collect(Collectors.toList()));
+ listmap.put("allList",list.stream().limit(10).collect(Collectors.toList()));
Map<String, List<BattalarmData>> ListMap = list.stream().collect(Collectors.groupingBy(BattalarmData::getStationName9));
Map<String,Object> levelMap=new HashMap<>();
Map<String,Object> typelMap=new HashMap<>();
@@ -1235,7 +1234,6 @@
map.put("allLevel",allLevelmap);
map.put("allType",allTypemap);
map.put("list",listmap);
- map.put("alllist",allListmap);
return new Response<>().setII(1,true,map,"");
} catch (Exception e) {
return new Response<>().set(1,false,"");
diff --git a/src/main/resources/mapper/BattRtstateMapper.xml b/src/main/resources/mapper/BattRtstateMapper.xml
index cc87a4d..9b804a6 100644
--- a/src/main/resources/mapper/BattRtstateMapper.xml
+++ b/src/main/resources/mapper/BattRtstateMapper.xml
@@ -470,13 +470,14 @@
<select id="getAllBattStateInSz2" resultType="com.whyc.pojo.BattRtstate">
select tb_batt_rtstate.*,StationName9 as stationName9
from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf
- where tb_batt_rtstate.BattGroupId
- in (select distinct db_battinf.tb_battinf.battgroupid
- from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
- where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId
- and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
- and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid
- and db_user.tb_user_inf.uid=#{userId} )
+ where tb_batt_rtstate.batt_state!=0
+ and tb_batt_rtstate.BattGroupId
+ in (select distinct db_battinf.tb_battinf.battgroupid
+ from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
+ where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId
+ and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
+ and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid
+ and db_user.tb_user_inf.uid=#{userId} )
</select>
--
Gitblit v1.9.1