From a867557192408a8ea7050b40b8dd157054146430 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 19 三月 2021 17:26:05 +0800
Subject: [PATCH] 更新 部分电池数据统计接口
---
src/main/java/com/whyc/service/BatteryAlarmService.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatteryAlarmService.java b/src/main/java/com/whyc/service/BatteryAlarmService.java
index 7691036..c88e086 100644
--- a/src/main/java/com/whyc/service/BatteryAlarmService.java
+++ b/src/main/java/com/whyc/service/BatteryAlarmService.java
@@ -54,9 +54,9 @@
int totalStationNum = infoMapper.getStationCount(userId);
//瀹归噺浣庡憡璀﹀崰姣�
- String capLowRateStr = MathUtil.divide(alarmNum,totalAlarmNum);
+ String capLowRateStr = (String) MathUtil.divide(alarmNum,totalAlarmNum,false);
//瀹归噺浣庡憡璀︽満鎴垮崰姣�
- String capLowStationRateStr = MathUtil.divide(stationNum,totalStationNum);
+ String capLowStationRateStr = (String) MathUtil.divide(stationNum,totalStationNum,false);
resultMap.put("鍛婅鏁�",alarmNum);
resultMap.put("鍛婅鎬绘暟",totalAlarmNum);
@@ -151,9 +151,9 @@
//鎬绘満鎴挎暟
int totalStationNum = infoMapper.getStationCount(userId);
//鏀剧數鐢垫祦浣庡憡璀﹀崰姣�
- String disChargeLowRateStr = MathUtil.divide(disChargeAlarmNum,totalAlarmNum);
+ String disChargeLowRateStr = (String) MathUtil.divide(disChargeAlarmNum,totalAlarmNum,false);
//鏀剧數鐢垫祦浣庡憡璀︽満鎴垮崰姣�
- String disChargeLowStationRateStr = MathUtil.divide(disChargeStationNum,totalStationNum);
+ String disChargeLowStationRateStr = (String) MathUtil.divide(disChargeStationNum,totalStationNum,false);
resultMap.put("浣庡憡璀︽暟閲�", disChargeAlarmNum); //浣庡憡璀︽暟閲� alm_signal_id:DisChargeCurr 7 high; 8 low
resultMap.put("鍛婅鏈烘埧鎬绘暟", disChargeStationNum); //鍛婅鏈烘埧鎬绘暟
@@ -193,9 +193,9 @@
int totalStationNum = infoMapper.getStationCount(userId);
//鏀剧數鐢垫祦楂樺憡璀﹀崰姣�
- String dischargeRateStr = MathUtil.divide(dischargeHighAlarmsNum,totalStationAlarmNum);
+ String dischargeRateStr = (String) MathUtil.divide(dischargeHighAlarmsNum,totalStationAlarmNum,false);
//鏀剧數鐢垫祦楂樺憡璀︽満鎴垮崰姣�
- String dischargeStationRateStr = MathUtil.divide(dischargeTotalAlarmStations,totalStationNum);
+ String dischargeStationRateStr = (String) MathUtil.divide(dischargeTotalAlarmStations,totalStationNum,false);
disCharge.put("楂樺憡璀︽暟閲�",dischargeHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id:ChargeCurrHigh 5 high; 6 low
disCharge.put("鍛婅鎬绘暟",totalStationAlarmNum); //鍛婅鎬绘暟
@@ -213,9 +213,9 @@
int chargeTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.ALM_SIGNAL_ID_ChargeCurrHigh);
//鏀剧數鐢垫祦楂樺憡璀﹀崰姣�
- String chargeRateStr = MathUtil.divide(chargeHighAlarmsNum,totalStationAlarmNum);
+ String chargeRateStr = (String) MathUtil.divide(chargeHighAlarmsNum,totalStationAlarmNum,false);
//鏀剧數鐢垫祦楂樺憡璀︽満鎴垮崰姣�
- String chargeStationRateStr = MathUtil.divide(chargeTotalAlarmStations,totalStationNum);
+ String chargeStationRateStr = (String) MathUtil.divide(chargeTotalAlarmStations,totalStationNum,false);
reCharge.put("楂樺憡璀︽暟閲�", chargeHighAlarmsNum); //楂樺憡璀︽暟閲�
reCharge.put("鍛婅鎬绘暟", totalStationAlarmNum); //鍛婅鎬绘暟
@@ -263,9 +263,9 @@
int totalStationNum = infoMapper.getStationCount(userId);
//鐢靛帇鍛婅鍗犳瘮
- String volRateStr = MathUtil.divide(volTotalAlarmNum,totalStationAlarmNum);
+ String volRateStr = (String) MathUtil.divide(volTotalAlarmNum,totalStationAlarmNum,false);
//鐢靛帇鍛婅鏈烘埧鍗犳瘮
- String volStationRateStr = MathUtil.divide(volTotalAlarmStations,totalStationNum);
+ String volStationRateStr = (String) MathUtil.divide(volTotalAlarmStations,totalStationNum,false);
monVolMap.put("楂樺憡璀︽暟閲�", volHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id 9
@@ -292,9 +292,9 @@
int resTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_res_Monomer);
//鍐呴樆鍛婅鍗犳瘮
- String resRateStr = MathUtil.divide(resTotalAlarmNum,totalStationAlarmNum);
+ String resRateStr = (String) MathUtil.divide(resTotalAlarmNum,totalStationAlarmNum,false);
//鍐呴樆鍛婅鏈烘埧鍗犳瘮
- String resStationRateStr = MathUtil.divide(resTotalAlarmStations,totalStationNum);
+ String resStationRateStr = (String) MathUtil.divide(resTotalAlarmStations,totalStationNum,false);
monResMap.put("楂樺憡璀︽暟閲�", resHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id 13
monResMap.put("浣庡憡璀︽暟閲�", resLowAlarmsNum); //浣庡憡璀︽暟閲� alm_signal_id 14
@@ -318,9 +318,9 @@
int tempTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_tmp_Monomer);
//娓╁害鍛婅鍗犳瘮
- String tempRateStr = MathUtil.divide(tempTotalAlarmNum,totalStationAlarmNum);
+ String tempRateStr = (String) MathUtil.divide(tempTotalAlarmNum,totalStationAlarmNum,false);
//娓╁害鍛婅鏈烘埧鍗犳瘮
- String tempStationRateStr = MathUtil.divide(tempTotalAlarmStations,totalStationNum);
+ String tempStationRateStr = (String) MathUtil.divide(tempTotalAlarmStations,totalStationNum,false);
monTemMap.put("楂樺憡璀︽暟閲�", tempHighAlarmsNum); //楂樺憡璀︽暟閲� alm_signal_id 13
monTemMap.put("浣庡憡璀︽暟閲�", tempLowAlarmsNum); //浣庡憡璀︽暟閲� alm_signal_id 14
@@ -358,9 +358,9 @@
int totalStationNum = infoMapper.getStationCount(userId);
//鍛婅鍗犳瘮
- String rate = MathUtil.divide(alarmNum,totalAlarmNum);
+ String rate = (String) MathUtil.divide(alarmNum,totalAlarmNum,false);
//鍛婅鏈烘埧鍗犳瘮
- String stationRate = MathUtil.divide(alarmStationNum,totalStationNum);
+ String stationRate = (String) MathUtil.divide(alarmStationNum,totalStationNum,false);
resMap.put(alarmName,alarmNum); //鍛婅鏁伴噺
resMap.put("鍛婅鎬绘暟", totalAlarmNum); //鍛婅鎬绘暟
@@ -403,9 +403,9 @@
int totalStationNum = infoMapper.getStationCount(userId);
//鍛婅鍗犳瘮
- String rate = MathUtil.divide(totalAlarmNum,totalAlarms);
+ String rate = (String) MathUtil.divide(totalAlarmNum,totalAlarms,false);
//鍛婅鏈烘埧鍗犳瘮
- String stationRate = MathUtil.divide(alarmStationNum,totalStationNum);
+ String stationRate = (String) MathUtil.divide(alarmStationNum,totalStationNum,false);
resMap.put(mapName1,alarmNum); //鍛婅1鏁伴噺
resMap.put(mapName2,alarmNum2); //鍛婅2鏁伴噺
--
Gitblit v1.9.1