From 1f8715acbe5ac4bbaa61ac0224a7f3d77470ccad Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 17 六月 2025 10:49:19 +0800
Subject: [PATCH] 领导层首页-设备数量概况信息统计
---
src/main/java/com/whyc/service/LeaderHomeService.java | 81 ++++++++++++++++++++++++++++++++++++----
src/main/java/com/whyc/service/BatttestdataInfService.java | 4 ++
src/main/resources/mapper/BatttestdataInfMapper.xml | 17 ++++++++
src/main/java/com/whyc/mapper/BatttestdataInfMapper.java | 1
4 files changed, 95 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/BatttestdataInfMapper.java b/src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
index f7e9cb4..c95c6e1 100644
--- a/src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
+++ b/src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
@@ -16,4 +16,5 @@
List<BatttestdataInf> getListByUserId(Integer userId);
+ int getHrDisCount(Integer userId, Date startTime, Date endTime);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 14bd9eb..c474e03 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -976,4 +976,8 @@
public List<BatttestdataInf> getListByUserId(Integer userId) {
return mapper.getListByUserId(userId);
}
+
+ public int getHrDisCount(Integer userId, Date startTime, Date endTime) {
+ return mapper.getHrDisCount(userId, startTime, endTime);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/LeaderHomeService.java b/src/main/java/com/whyc/service/LeaderHomeService.java
index 2648e42..e03a970 100644
--- a/src/main/java/com/whyc/service/LeaderHomeService.java
+++ b/src/main/java/com/whyc/service/LeaderHomeService.java
@@ -18,6 +18,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
+import java.time.LocalTime;
import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadPoolExecutor;
@@ -60,7 +62,6 @@
private BatttestdataIdService battTestDataIdService;
-
public Response getAll(Integer userId) {
Response response = new Response();
Map<String,Object> map = new HashMap<>();
@@ -89,9 +90,9 @@
testDataInfoStatistics(userId, map);
latch.countDown();
});
- //TODO 璁惧鏁伴噺淇℃伅缁熻
+ //10绫诲熀纭�璧勪骇淇℃伅缁熻
poolExecutor.execute(() -> {
- //deviceInfoStatistics(userId, map);
+ deviceInfoStatistics(userId, map);
latch.countDown();
});
@@ -108,6 +109,69 @@
return response;
}
+
+ private void deviceInfoStatistics(Integer userId, Map<String, Object> map) {
+ NameValueIntDto baseDto = new NameValueIntDto();
+ int powerCount = powerInfService.getListByUserId(userId).size();
+ map.put("powerCount", powerCount);
+ List<BattInf> battInfList = battInfService.getListByUserId(userId);
+ int battCount = battInfList.size();
+ Map<Integer, List<BattInf>> devIdMap = battInfList.stream().collect(Collectors.groupingBy(BattInf::getDevId));
+ map.put("devCount", devIdMap.size());
+ map.put("battCount",battCount);
+ int monCountTotal = 0;
+ for (int i = 0; i < battCount; i++) {
+ int monCount = battInfList.get(i).getMoncount().intValue();
+ monCountTotal += monCount;
+ }
+ map.put("monCount", monCountTotal);
+
+ LocalDateTime now = LocalDateTime.now();
+ //鏈勾绗竴澶�
+ LocalDateTime yearStart = now.withDayOfYear(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
+ Date yearStartTime = DateUtil.convertToDate(yearStart);
+ //鍘诲勾鐨勭涓�澶�
+ LocalDateTime lastYearStart = now.minusYears(1).withDayOfYear(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
+ //鍘诲勾鐨勬渶鍚庝竴澶�
+ int lastYear = now.minusYears(1).getYear();
+ LocalDate lastDayOfLastYear = LocalDate.of(lastYear, 12, 31);
+ LocalDateTime lastYearEnd = lastDayOfLastYear.atTime(LocalTime.MAX);
+ Date lastYearStartTime = DateUtil.convertToDate(lastYearStart);
+ Date lastYearEndTime = DateUtil.convertToDate(lastYearEnd);
+
+ //鏈勾宸叉斁鐢电數姹犳暟閲�
+ //鏈勾鏈斁鐢电數姹犳暟閲�
+ //鍘诲勾宸叉斁鐢电數姹犳暟閲�
+ //鍘诲勾鏈斁鐢电數姹犳暟閲�
+ int hrDisBattCount = battTestDataInfService.getHrDisCount(userId,yearStartTime,null);
+ int hrNoDisBattCount = battCount - hrDisBattCount;
+ int hrDisBattCountLastYear = battTestDataInfService.getHrDisCount(userId,lastYearStartTime,lastYearEndTime);
+ int hrNoDisBattCountLastYear = battCount - hrDisBattCountLastYear;
+ map.put("hrDisBattCount", hrDisBattCount);
+ map.put("hrNoDisBattCount", hrNoDisBattCount);
+ map.put("hrDisBattCountLastYear", hrDisBattCountLastYear);
+ map.put("hrNoDisBattCountLastYear", hrNoDisBattCountLastYear);
+
+ //鏈勾浼樿壇鍔ｅ寲鎹熷潖鏁伴噺
+ List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList,yearStartTime,null);
+ long battGoodCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName())).count();
+ long battBadCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName())).count();
+ long battDamageCount = battCapInfoList.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName())).count();
+ //鍘诲勾浼樿壇鍔ｅ寲鎹熷潖鏁伴噺
+ List<BattCapInfoDto> battCapInfoListLastYear = getBattCapInfo(battInfList,lastYearStartTime,lastYearEndTime);
+ long battGoodCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_1.getStateName())).count();
+ long battBadCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_2.getStateName())).count();
+ long battDamageCountLastYear = battCapInfoListLastYear.stream().filter(battCapInfo -> battCapInfo.getPerformance().equals(Capperformance.BATTSTATE_3.getStateName())).count();
+ map.put("battGoodCount", battGoodCount);
+ map.put("battBadCount", battBadCount);
+ map.put("battDamageCount", battDamageCount);
+ map.put("battGoodCountLastYear", battGoodCountLastYear);
+ map.put("battBadCountLastYear", battBadCountLastYear);
+ map.put("battDamageCountLastYear", battDamageCountLastYear);
+ //TODO 浼樿壇鐢垫簮鏁伴噺
+ map.put("powerGoodCount","浼樿壇鍒ゅ畾鏍囧噯寰呯‘瀹�" );
+ }
+
private void alarmRealtimeStatistics(Integer userId, Map<String, Object> map) {
//鐢垫睜鍛婅淇℃伅缁熻
@@ -792,7 +856,7 @@
battInf.setProduct(brand);
//鏌ヨ婊¤冻鏉′欢鐨勮搫鐢垫睜鍒楄〃
List<BattInf> battInfList = battInfService.getListByCondition(userId,battInf);
- List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList);
+ List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList,null,null);
//data,鍜宒ata2鍒嗗埆杩斿洖 缁熻鏁伴噺鍜� 绔欑偣浼樿壇,鍔ｅ寲,鎹熷潖 鍓嶄簩鐨勪俊鎭�
List<NameValueIntDto> data = new ArrayList<>();
List<NameValueListDto> data2 = new ArrayList<>();
@@ -836,7 +900,7 @@
battInf.setInuseTime(inuseTimeStart);
//鏌ヨ婊¤冻鏉′欢鐨勮搫鐢垫睜鍒楄〃
List<BattInf> battInfList = battInfService.getListByCondition(userId,battInf);
- List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList);
+ List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList,null,null);
//data,鏍规嵁鍝佺墝鍒嗙粍缁熻鐧惧垎姣�
Map<String, List<BattCapInfoDto>> brandMap = battCapInfoList.stream().collect(Collectors.groupingBy(BattCapInfoDto::getProduct));
@@ -943,7 +1007,7 @@
battInf.setProduct(brand);
//鏌ヨ婊¤冻鏉′欢鐨勮搫鐢垫睜鍒楄〃
List<BattInf> battInfList = battInfService.getListByCondition(userId,battInf);
- List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList);
+ List<BattCapInfoDto> battCapInfoList = getBattCapInfo(battInfList,null,null);
//data,TODO 鎶曡繍鏃堕棿鐨勭淮搴﹀弬鏁�,鍏堝浐瀹氬彉閲�,鍚庣画浠庢暟鎹簱鑾峰彇
//time1鍜宼ime2鐨勫崟浣嶄负骞�
@@ -1055,7 +1119,7 @@
}
- public List<BattCapInfoDto> getBattCapInfo(List<BattInf> battInfList) {
+ public List<BattCapInfoDto> getBattCapInfo(List<BattInf> battInfList,Date startTime, Date endTime) {
//鑾峰彇鏍稿浼樺姡锛屾崯鍧忓弬鏁�
List<AppParam> paramList=appParamService.getHrParam();
Float badValue=0f;
@@ -1086,7 +1150,8 @@
capInfo.setInuseTime(battInf.getInuseTime());
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
- BatttestdataInf testInf = battTestDataInfService.getLastStandardTestDataByTime(battInf.getBattgroupId(), battInf.getInuseTime(),null);
+ //BatttestdataInf testInf = battTestDataInfService.getLastStandardTestDataByTime(battInf.getBattgroupId(), battInf.getInuseTime(),null);
+ BatttestdataInf testInf = battTestDataInfService.getLastStandardTestDataByTime(battInf.getBattgroupId(), startTime,endTime);
if (testInf == null) {
capInfo.setRealCap(0f);
capInfo.setCapPercentage("0");
diff --git a/src/main/resources/mapper/BatttestdataInfMapper.xml b/src/main/resources/mapper/BatttestdataInfMapper.xml
index 37571f4..304aec3 100644
--- a/src/main/resources/mapper/BatttestdataInfMapper.xml
+++ b/src/main/resources/mapper/BatttestdataInfMapper.xml
@@ -71,4 +71,21 @@
)
</select>
+ <select id="getHrDisCount" resultType="java.lang.Integer">
+ select distinct battgroup_id from db_batt_testdata.tb_batttestdata_inf
+ where test_type=3
+ and test_starttype=3 and test_timelong >=7200
+ <if test="startTime!=null">
+ and test_starttime >= #{startTime}
+ </if>
+ <if test="endTime!=null">
+ and test_starttime <= #{endTime}
+ </if>
+ and battgroup_id in(
+ select distinct battgroup_id from db_user.tb_baojigroup_usr bu,db_user.tb_baojigroup_power bp,db_station.tb_batt_inf bi
+ where bu.baoji_group_id = bp.baoji_group_id
+ and bp.station_id = bi.station_id
+ and bu.uid = #{userId}
+ )
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1