更新接口

whycxzp

2021-10-11 751d815567417fb8be939f6b9cd024da626c7226

更新接口

 src/main/java/com/whyc/service/BatteryAlarmService.java

@@ -45,8 +45,10 @@

        try {
            //单体容量低告警数和对应的告警机房数
            BatteryAlarmDto batteryAlarmDto = mapper.getLowCapacityAlarms(userId,AlarmConstant.Alarm_IGNAL_ID_CapAlarmLow);
            int alarmNum = batteryAlarmDto.getNum();
            //BatteryAlarmDto batteryAlarmDto = mapper.getLowCapacityAlarms(userId,AlarmConstant.Alarm_IGNAL_ID_CapAlarmLow);
            //int alarmNum = batteryAlarmDto.getNum();
            Integer alarmLow = mapper.getAlarmHighLow(userId, AlarmConstant.Alarm_IGNAL_ID_CapAlarmLow);
            Integer alarmHigh = mapper.getAlarmHighLow(userId, AlarmConstant.Alarm_IGNAL_ID_CapAlarmHigh);
            //int stationNum = batteryAlarmDto.getStationNum();
            //总告警数
            //Integer totalAlarmNum = mapper.getTotalAlarms(userId);
@@ -58,7 +60,8 @@
            //容量低告警机房占比
            //String capLowStationRateStr = (String) MathUtil.divide(stationNum,totalStationNum,3);

            resultMap.put("告警数",alarmNum);
            resultMap.put("低告警数",alarmLow);
            resultMap.put("高告警数",alarmHigh);
            //resultMap.put("告警总数",totalAlarmNum);
            //resultMap.put("告警占比",capLowRateStr);

@@ -142,8 +145,10 @@

        try {
            //放电电流低告警数和对应的告警机房数
            BatteryAlarmDto batteryAlarmDto = mapper.getLowDischargeAlarms(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrLow);
            int disChargeAlarmNum = batteryAlarmDto.getNum();
            //BatteryAlarmDto batteryAlarmDto = mapper.getLowDischargeAlarms(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrLow);
            //int disChargeAlarmNum = batteryAlarmDto.getNum();
            int dischargeLowAlarmNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrLow);
            int dischargeHighAlarmNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrHigh);
            //int disChargeStationNum = batteryAlarmDto.getStationNum();

            //总告警数
@@ -155,7 +160,8 @@
            //放电电流低告警机房占比
            //String disChargeLowStationRateStr = (String) MathUtil.divide(disChargeStationNum,totalStationNum,3);

            resultMap.put("低告警数量", disChargeAlarmNum);     //低告警数量 alm_signal_id:DisChargeCurr 7 high; 8 low
            resultMap.put("低告警数量", dischargeLowAlarmNum);     //低告警数量 alm_signal_id:DisChargeCurr 7 high; 8 low
            resultMap.put("高告警数量", dischargeHighAlarmNum);     //低告警数量 alm_signal_id:DisChargeCurr 7 high; 8 low
            //resultMap.put("告警机房总数", disChargeStationNum);      //告警机房总数
            //resultMap.put("告警机房数比例", disChargeLowRateStr);    //告警机房数比例
            //resultMap.put("告警总数", totalAlarmNum);        //告警总数
@@ -182,6 +188,8 @@

        //放电电流高告警数量
        Integer dischargeHighAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrHigh);
        //放电电流低告警数量
        Integer dischargeLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrLow);

        //告警总数
        //Integer totalStationAlarmNum =mapper.getTotalAlarms(userId);
@@ -198,6 +206,7 @@
        //String dischargeStationRateStr = (String) MathUtil.divide(dischargeTotalAlarmStations,totalStationNum,3);

        disCharge.put("高告警数量",dischargeHighAlarmsNum);     //高告警数量    alm_signal_id:ChargeCurrHigh 5 high; 6 low
        disCharge.put("低告警数量",dischargeLowAlarmsNum);
        //disCharge.put("告警总数",totalStationAlarmNum);        //告警总数
        //disCharge.put("告警总数比例", dischargeRateStr);      //告警总数比例
        //disCharge.put("告警机房总数", dischargeTotalAlarmStations);      //告警机房总数
@@ -208,9 +217,10 @@

        //放电电流高告警数量
        Integer chargeHighAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_ChargeCurrHigh);
        Integer chargeLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_ChargeCurrLow);

        //放电电流高告警机房数
        int chargeTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.ALM_SIGNAL_ID_ChargeCurrHigh);
        //int chargeTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.ALM_SIGNAL_ID_ChargeCurrHigh);

        //放电电流高告警占比
        //String chargeRateStr = (String) MathUtil.divide(chargeHighAlarmsNum,totalStationAlarmNum,3);
@@ -218,6 +228,7 @@
        //String chargeStationRateStr = (String) MathUtil.divide(chargeTotalAlarmStations,totalStationNum,3);

        reCharge.put("高告警数量", chargeHighAlarmsNum);     //高告警数量
        reCharge.put("低告警数量", chargeLowAlarmsNum);     //高告警数量
        //reCharge.put("告警总数", totalStationAlarmNum);        //告警总数
        //reCharge.put("告警总数比例", chargeRateStr);      //告警总数比例
        //reCharge.put("告警机房总数", chargeTotalAlarmStations);      //告警机房总数