From d39cd5a17b4dfa9ea8dcf1141a2b9383f62c6305 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 11 十月 2021 09:02:41 +0800
Subject: [PATCH] 去除接口 告警总数/告警机房相关数据
---
src/main/java/com/whyc/service/BatteryAlarmService.java | 126 +++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatteryAlarmService.java b/src/main/java/com/whyc/service/BatteryAlarmService.java
index 3a4e0fe..0f5f681 100644
--- a/src/main/java/com/whyc/service/BatteryAlarmService.java
+++ b/src/main/java/com/whyc/service/BatteryAlarmService.java
@@ -47,22 +47,22 @@
//鍗曚綋瀹归噺浣庡憡璀︽暟鍜屽搴旂殑鍛婅鏈烘埧鏁�
BatteryAlarmDto batteryAlarmDto = mapper.getLowCapacityAlarms(userId,AlarmConstant.Alarm_IGNAL_ID_CapAlarmLow);
int alarmNum = batteryAlarmDto.getNum();
- int stationNum = batteryAlarmDto.getStationNum();
+ //int stationNum = batteryAlarmDto.getStationNum();
//鎬诲憡璀︽暟
- Integer totalAlarmNum = mapper.getTotalAlarms(userId);
+ //Integer totalAlarmNum = mapper.getTotalAlarms(userId);
//鎬绘満鎴挎暟
- int totalStationNum = infoMapper.getStationCount(userId);
+ //int totalStationNum = infoMapper.getStationCount(userId);
//瀹归噺浣庡憡璀﹀崰姣�
- String capLowRateStr = (String) MathUtil.divide(alarmNum,totalAlarmNum,3);
+ //String capLowRateStr = (String) MathUtil.divide(alarmNum,totalAlarmNum,3);
//瀹归噺浣庡憡璀︽満鎴垮崰姣�
- String capLowStationRateStr = (String) MathUtil.divide(stationNum,totalStationNum,3);
+ //String capLowStationRateStr = (String) MathUtil.divide(stationNum,totalStationNum,3);
resultMap.put("鍛婅鏁�",alarmNum);
- resultMap.put("鍛婅鎬绘暟",totalAlarmNum);
+ //resultMap.put("鍛婅鎬绘暟",totalAlarmNum);
//resultMap.put("鍛婅鍗犳瘮",capLowRateStr);
- resultMap.put("鍛婅鏈烘埧鏁�",alarmNum);
+ //resultMap.put("鍛婅鏈烘埧鏁�",alarmNum);
//resultMap.put("鍛婅鏈烘埧鍗犳瘮",capLowStationRateStr);
response.set(1, resultMap);
@@ -144,22 +144,22 @@
//鏀剧數鐢垫祦浣庡憡璀︽暟鍜屽搴旂殑鍛婅鏈烘埧鏁�
BatteryAlarmDto batteryAlarmDto = mapper.getLowDischargeAlarms(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrLow);
int disChargeAlarmNum = batteryAlarmDto.getNum();
- int disChargeStationNum = batteryAlarmDto.getStationNum();
+ //int disChargeStationNum = batteryAlarmDto.getStationNum();
//鎬诲憡璀︽暟
- Integer totalAlarmNum = mapper.getTotalAlarms(userId);
+ //Integer totalAlarmNum = mapper.getTotalAlarms(userId);
//鎬绘満鎴挎暟
- int totalStationNum = infoMapper.getStationCount(userId);
+ //int totalStationNum = infoMapper.getStationCount(userId);
//鏀剧數鐢垫祦浣庡憡璀﹀崰姣�
- String disChargeLowRateStr = (String) MathUtil.divide(disChargeAlarmNum,totalAlarmNum,3);
+ //String disChargeLowRateStr = (String) MathUtil.divide(disChargeAlarmNum,totalAlarmNum,3);
//鏀剧數鐢垫祦浣庡憡璀︽満鎴垮崰姣�
- String disChargeLowStationRateStr = (String) MathUtil.divide(disChargeStationNum,totalStationNum,3);
+ //String disChargeLowStationRateStr = (String) MathUtil.divide(disChargeStationNum,totalStationNum,3);
resultMap.put("浣庡憡璀︽暟閲�", disChargeAlarmNum); //浣庡憡璀︽暟閲� alm_signal_id:DisChargeCurr 7 high; 8 low
- resultMap.put("鍛婅鏈烘埧鎬绘暟", disChargeStationNum); //鍛婅鏈烘埧鎬绘暟
- resultMap.put("鍛婅鏈烘埧鏁版瘮渚�", disChargeLowRateStr); //鍛婅鏈烘埧鏁版瘮渚�
- resultMap.put("鍛婅鎬绘暟", totalAlarmNum); //鍛婅鎬绘暟
- resultMap.put("鍛婅鎬绘暟姣斾緥", disChargeLowStationRateStr); //鍛婅鎬绘暟姣斾緥
+ //resultMap.put("鍛婅鏈烘埧鎬绘暟", disChargeStationNum); //鍛婅鏈烘埧鎬绘暟
+ //resultMap.put("鍛婅鏈烘埧鏁版瘮渚�", disChargeLowRateStr); //鍛婅鏈烘埧鏁版瘮渚�
+ //resultMap.put("鍛婅鎬绘暟", totalAlarmNum); //鍛婅鎬绘暟
+ //resultMap.put("鍛婅鎬绘暟姣斾緥", disChargeLowStationRateStr); //鍛婅鎬绘暟姣斾緥
response.setCode(1);
response.setData(resultMap);
} catch (Exception e) {
@@ -184,23 +184,23 @@
Integer dischargeHighAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrHigh);
//鍛婅鎬绘暟
- Integer totalStationAlarmNum =mapper.getTotalAlarms(userId);
+ //Integer totalStationAlarmNum =mapper.getTotalAlarms(userId);
//鏀剧數鐢垫祦楂樺憡璀︽満鎴挎暟
- int dischargeTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrHigh);
+ //int dischargeTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrHigh);
//鎬绘満鎴挎暟
- int totalStationNum = infoMapper.getStationCount(userId);
+ //int totalStationNum = infoMapper.getStationCount(userId);
//鏀剧數鐢垫祦楂樺憡璀﹀崰姣�
- String dischargeRateStr = (String) MathUtil.divide(dischargeHighAlarmsNum,totalStationAlarmNum,3);
+ //String dischargeRateStr = (String) MathUtil.divide(dischargeHighAlarmsNum,totalStationAlarmNum,3);
//鏀剧數鐢垫祦楂樺憡璀︽満鎴垮崰姣�
- String dischargeStationRateStr = (String) MathUtil.divide(dischargeTotalAlarmStations,totalStationNum,3);
+ //String dischargeStationRateStr = (String) MathUtil.divide(dischargeTotalAlarmStations,totalStationNum,3);
disCharge.put("楂樺憡璀︽暟閲�",dischargeHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id:ChargeCurrHigh 5 high; 6 low
- disCharge.put("鍛婅鎬绘暟",totalStationAlarmNum); //鍛婅鎬绘暟
+ //disCharge.put("鍛婅鎬绘暟",totalStationAlarmNum); //鍛婅鎬绘暟
//disCharge.put("鍛婅鎬绘暟姣斾緥", dischargeRateStr); //鍛婅鎬绘暟姣斾緥
- disCharge.put("鍛婅鏈烘埧鎬绘暟", dischargeTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
+ //disCharge.put("鍛婅鏈烘埧鎬绘暟", dischargeTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
//disCharge.put("鍛婅鏈烘埧鏁版瘮渚�",dischargeStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
resultMap.put("disCharge", disCharge);
@@ -213,15 +213,15 @@
int chargeTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.ALM_SIGNAL_ID_ChargeCurrHigh);
//鏀剧數鐢垫祦楂樺憡璀﹀崰姣�
- String chargeRateStr = (String) MathUtil.divide(chargeHighAlarmsNum,totalStationAlarmNum,3);
+ //String chargeRateStr = (String) MathUtil.divide(chargeHighAlarmsNum,totalStationAlarmNum,3);
//鏀剧數鐢垫祦楂樺憡璀︽満鎴垮崰姣�
- String chargeStationRateStr = (String) MathUtil.divide(chargeTotalAlarmStations,totalStationNum,3);
+ //String chargeStationRateStr = (String) MathUtil.divide(chargeTotalAlarmStations,totalStationNum,3);
reCharge.put("楂樺憡璀︽暟閲�", chargeHighAlarmsNum); //楂樺憡璀︽暟閲�
- reCharge.put("鍛婅鎬绘暟", totalStationAlarmNum); //鍛婅鎬绘暟
- reCharge.put("鍛婅鎬绘暟姣斾緥", chargeRateStr); //鍛婅鎬绘暟姣斾緥
- reCharge.put("鍛婅鏈烘埧鎬绘暟", chargeTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
- reCharge.put("鍛婅鏈烘埧鏁版瘮渚�", chargeStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
+ //reCharge.put("鍛婅鎬绘暟", totalStationAlarmNum); //鍛婅鎬绘暟
+ //reCharge.put("鍛婅鎬绘暟姣斾緥", chargeRateStr); //鍛婅鎬绘暟姣斾緥
+ //reCharge.put("鍛婅鏈烘埧鎬绘暟", chargeTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
+ //reCharge.put("鍛婅鏈烘埧鏁版瘮渚�", chargeStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
resultMap.put("reCharge", reCharge);
return new Response<Map>().set(1,resultMap);
@@ -251,29 +251,29 @@
Integer volLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonVolLow);
//鍗曚綋鐢靛帇鎬诲憡璀︽暟
- Integer volTotalAlarmNum = volHighAlarmsNum+volLowAlarmsNum;
+ //Integer volTotalAlarmNum = volHighAlarmsNum+volLowAlarmsNum;
//鍛婅鎬绘暟
- Integer totalStationAlarmNum =mapper.getTotalAlarms(userId);
+ //Integer totalStationAlarmNum =mapper.getTotalAlarms(userId);
//鐢靛帇鍛婅鏈烘埧鏁�
- int volTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_vol_Monomer);
+ //int volTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_vol_Monomer);
//鎬绘満鎴挎暟
- int totalStationNum = infoMapper.getStationCount(userId);
+ //int totalStationNum = infoMapper.getStationCount(userId);
//鐢靛帇鍛婅鍗犳瘮
- String volRateStr = (String) MathUtil.divide(volTotalAlarmNum,totalStationAlarmNum,3);
+ //String volRateStr = (String) MathUtil.divide(volTotalAlarmNum,totalStationAlarmNum,3);
//鐢靛帇鍛婅鏈烘埧鍗犳瘮
- String volStationRateStr = (String) MathUtil.divide(volTotalAlarmStations,totalStationNum,3);
+ //String volStationRateStr = (String) MathUtil.divide(volTotalAlarmStations,totalStationNum,3);
monVolMap.put("楂樺憡璀︽暟閲�", volHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id 9
monVolMap.put("浣庡憡璀︽暟閲�", volLowAlarmsNum); //浣庡憡璀︽暟閲� alm_signal_id 10
- monVolMap.put("鍛婅鎬绘暟", volTotalAlarmNum); //鍛婅鎬绘暟
- monVolMap.put("鍛婅鎬绘暟姣斾緥", volRateStr); //鍛婅鎬绘暟姣斾緥
- monVolMap.put("鍛婅鏈烘埧鎬绘暟", volTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
- monVolMap.put("鍛婅鏈烘埧鏁版瘮渚�", volStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
+ //monVolMap.put("鍛婅鎬绘暟", volTotalAlarmNum); //鍛婅鎬绘暟
+ //monVolMap.put("鍛婅鎬绘暟姣斾緥", volRateStr); //鍛婅鎬绘暟姣斾緥
+ //monVolMap.put("鍛婅鏈烘埧鎬绘暟", volTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
+ //monVolMap.put("鍛婅鏈烘埧鏁版瘮渚�", volStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
resultMap.put("鍗曚綋鐢靛帇", monVolMap);
@@ -286,22 +286,22 @@
Integer resLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonResLow);
//鍗曚綋鍐呴樆鎬诲憡璀︽暟
- Integer resTotalAlarmNum = resHighAlarmsNum+resLowAlarmsNum;
+ //Integer resTotalAlarmNum = resHighAlarmsNum+resLowAlarmsNum;
//鍐呴樆鍛婅鏈烘埧鏁�
- int resTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_res_Monomer);
+ //int resTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_res_Monomer);
//鍐呴樆鍛婅鍗犳瘮
- String resRateStr = (String) MathUtil.divide(resTotalAlarmNum,totalStationAlarmNum,3);
+ //String resRateStr = (String) MathUtil.divide(resTotalAlarmNum,totalStationAlarmNum,3);
//鍐呴樆鍛婅鏈烘埧鍗犳瘮
- String resStationRateStr = (String) MathUtil.divide(resTotalAlarmStations,totalStationNum,3);
+ //String resStationRateStr = (String) MathUtil.divide(resTotalAlarmStations,totalStationNum,3);
monResMap.put("楂樺憡璀︽暟閲�", resHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id 13
monResMap.put("浣庡憡璀︽暟閲�", resLowAlarmsNum); //浣庡憡璀︽暟閲� alm_signal_id 14
- monResMap.put("鍛婅鎬绘暟", resTotalAlarmNum); //鍛婅鎬绘暟
- monResMap.put("鍛婅鎬绘暟姣斾緥", resRateStr); //鍛婅鎬绘暟姣斾緥
- monResMap.put("鍛婅鏈烘埧鎬绘暟", resTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
- monResMap.put("鍛婅鏈烘埧鏁版瘮渚�", resStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
+ //monResMap.put("鍛婅鎬绘暟", resTotalAlarmNum); //鍛婅鎬绘暟
+ //monResMap.put("鍛婅鎬绘暟姣斾緥", resRateStr); //鍛婅鎬绘暟姣斾緥
+ //monResMap.put("鍛婅鏈烘埧鎬绘暟", resTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
+ //monResMap.put("鍛婅鏈烘埧鏁版瘮渚�", resStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
resultMap.put("鍗曚綋鍐呴樆", monResMap);
/*======鍗曚綋娓╁害======*/
@@ -312,22 +312,22 @@
Integer tempLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonTmpLow);
//鍗曚綋娓╁害鎬诲憡璀︽暟
- Integer tempTotalAlarmNum = tempHighAlarmsNum+tempLowAlarmsNum;
+ //Integer tempTotalAlarmNum = tempHighAlarmsNum+tempLowAlarmsNum;
//娓╁害鍛婅鏈烘埧鏁�
- int tempTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_tmp_Monomer);
+ //int tempTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_tmp_Monomer);
//娓╁害鍛婅鍗犳瘮
- String tempRateStr = (String) MathUtil.divide(tempTotalAlarmNum,totalStationAlarmNum,3);
+ //String tempRateStr = (String) MathUtil.divide(tempTotalAlarmNum,totalStationAlarmNum,3);
//娓╁害鍛婅鏈烘埧鍗犳瘮
- String tempStationRateStr = (String) MathUtil.divide(tempTotalAlarmStations,totalStationNum,3);
+ //String tempStationRateStr = (String) MathUtil.divide(tempTotalAlarmStations,totalStationNum,3);
monTemMap.put("楂樺憡璀︽暟閲�", tempHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id 13
monTemMap.put("浣庡憡璀︽暟閲�", tempLowAlarmsNum); //浣庡憡璀︽暟閲� alm_signal_id 14
- monTemMap.put("鍛婅鎬绘暟", tempTotalAlarmNum); //鍛婅鎬绘暟
- monTemMap.put("鍛婅鎬绘暟姣斾緥", tempRateStr); //鍛婅鎬绘暟姣斾緥
- monTemMap.put("鍛婅鏈烘埧鎬绘暟", tempTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
- monTemMap.put("鍛婅鏈烘埧鏁版瘮渚�", tempStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
+ //monTemMap.put("鍛婅鎬绘暟", tempTotalAlarmNum); //鍛婅鎬绘暟
+ //monTemMap.put("鍛婅鎬绘暟姣斾緥", tempRateStr); //鍛婅鎬绘暟姣斾緥
+ //monTemMap.put("鍛婅鏈烘埧鎬绘暟", tempTotalAlarmStations); //鍛婅鏈烘埧鎬绘暟
+ //monTemMap.put("鍛婅鏈烘埧鏁版瘮渚�", tempStationRateStr); //鍛婅鏈烘埧鏁版瘮渚�
resultMap.put("鍗曚綋娓╁害", monTemMap);
response.setCode(1);
@@ -391,27 +391,27 @@
Integer alarmNum2 = mapper.getAlarmHighLow(userId,alarmSignalIds.get(i)+1);
//鍛婅鎬绘暟
- Integer totalAlarmNum =alarmNum+alarmNum2;
+ //Integer totalAlarmNum =alarmNum+alarmNum2;
//鎬诲憡璀︽暟
- Integer totalAlarms = mapper.getTotalAlarms(userId);
+ //Integer totalAlarms = mapper.getTotalAlarms(userId);
//鍛婅鏈烘埧鏁�
- int alarmStationNum = mapper.getTotalAlarmStations(userId,alarmIds.get(i));
+ //int alarmStationNum = mapper.getTotalAlarmStations(userId,alarmIds.get(i));
//鎬绘満鎴挎暟
- int totalStationNum = infoMapper.getStationCount(userId);
+ //int totalStationNum = infoMapper.getStationCount(userId);
//鍛婅鍗犳瘮
- String rate = (String) MathUtil.divide(totalAlarmNum,totalAlarms,3);
+ //String rate = (String) MathUtil.divide(totalAlarmNum,totalAlarms,3);
//鍛婅鏈烘埧鍗犳瘮
- String stationRate = (String) MathUtil.divide(alarmStationNum,totalStationNum,3);
+ //String stationRate = (String) MathUtil.divide(alarmStationNum,totalStationNum,3);
resMap.put(mapName1,alarmNum); //鍛婅1鏁伴噺
resMap.put(mapName2,alarmNum2); //鍛婅2鏁伴噺
- resMap.put("鍛婅鎬绘暟", totalAlarmNum); //鍛婅鎬绘暟
+ //resMap.put("鍛婅鎬绘暟", totalAlarmNum); //鍛婅鎬绘暟
//resMap.put("鍛婅鎬绘暟姣斾緥", rate); //鍛婅鎬绘暟姣斾緥
- resMap.put("鍛婅鏈烘埧鎬绘暟", alarmStationNum); //鍛婅鏈烘埧鎬绘暟
+ //resMap.put("鍛婅鏈烘埧鎬绘暟", alarmStationNum); //鍛婅鏈烘埧鎬绘暟
//resMap.put("鍛婅鏈烘埧鏁版瘮渚�", stationRate); //鍛婅鏈烘埧鏁版瘮渚�
res.put(alarmNames.get(i),resMap);
}
--
Gitblit v1.9.1