From fcdf8edb15271327988c9e52c25514c8b6eb5677 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 13 三月 2021 11:07:26 +0800
Subject: [PATCH] 更新 初步电池电源告警接口

---
 src/main/java/com/whyc/service/BatteryAlarmService.java |  187 ++++++++++++++++++++++++----------------------
 1 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/src/main/java/com/whyc/service/BatteryAlarmService.java b/src/main/java/com/whyc/service/BatteryAlarmService.java
index 85385cd..60026e8 100644
--- a/src/main/java/com/whyc/service/BatteryAlarmService.java
+++ b/src/main/java/com/whyc/service/BatteryAlarmService.java
@@ -78,9 +78,10 @@
      * @param userId
      * @return
      */
+    //TODO
     public Response<Map> getOnlineAndGroupVolAnalysis(int userId) {
 //        select alm_signal_id,count(alm_signal_id) as num from db_alarm.tb_battalarm_data alarm where alm_id in (119001,119002,119003,119004)
-        Response<Map> response = new Response();   //TODO RZG
+        Response<Map> response = new Response();
         HashMap<String, Object> resultMap = new HashMap<>();
         Map<String, Integer> resMap = new HashMap<>();//鍐呴樆娴嬭瘯鏁伴噺
         Map<String, Integer> errMap = new HashMap<>();//鏁呴殰鏁伴噺
@@ -91,27 +92,27 @@
 
             Integer highAlarmNum = onlinebatteryAlarmDto.getNum();
             Integer stationNum = onlinebatteryAlarmDto.getStationNum();
-            resMap.put("highAlarmsNO", 1);     //楂樺憡璀︽暟閲�    alm_signal_id:online 1 high; 2 low
+            resMap.put("楂樺憡璀︽暟閲�", 1);     //楂樺憡璀︽暟閲�    alm_signal_id:online 1 high; 2 low
 
-            resMap.put("lowAlarmsNO", 1);     //浣庡憡璀︽暟閲�
-            resMap.put("totalAlarmsScale", 1);      //鍛婅鎬绘暟姣斾緥
+            resMap.put("浣庡憡璀︽暟閲�", 1);     //浣庡憡璀︽暟閲�
+            resMap.put("鍛婅鎬绘暟姣斾緥", 1);      //鍛婅鎬绘暟姣斾緥
 
             Integer totalAlarmNum = mapper.getTotalAlarms(userId);
             resMap.put("鍛婅鎬绘暟", totalAlarmNum);        //鍛婅鎬绘暟
 
             Integer totalAlarmRooms = mapper.getTotalAlarmRooms(userId);
-            resMap.put("totalAlarmRooms", 1);      //鍛婅鏈烘埧鎬绘暟
+            resMap.put("鍛婅鏈烘埧鎬绘暟", 1);      //鍛婅鏈烘埧鎬绘暟
 
-            resMap.put("lowAlarmRoomsScale", 1);    //浣庡憡璀︽満鎴挎暟姣斾緥
+            resMap.put("浣庡憡璀︽満鎴挎暟姣斾緥", 1);    //浣庡憡璀︽満鎴挎暟姣斾緥
             resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", resMap);
 
 
-            errMap.put("highAlarmsNO", 1);     //楂樺憡璀︽暟閲�
-            errMap.put("lowAlarmsNO", 1);     //浣庡憡璀︽暟閲�
-            errMap.put("totalAlarmsScale", 1);      //鍛婅鎬绘暟姣斾緥
-            errMap.put("totalAlarms", 1);        //鍛婅鎬绘暟
-            errMap.put("totalAlarmRooms", 1);      //鍛婅鏈烘埧鎬绘暟
-            errMap.put("lowAlarmRoomsScale", 1);    //浣庡憡璀︽満鎴挎暟姣斾緥
+            errMap.put("楂樺憡璀︽暟閲�", 1);     //楂樺憡璀︽暟閲�
+            errMap.put("浣庡憡璀︽暟閲�", 1);     //浣庡憡璀︽暟閲�
+            errMap.put("鍛婅鎬绘暟姣斾緥", 1);      //鍛婅鎬绘暟姣斾緥
+            errMap.put("鍛婅鎬绘暟", 1);        //鍛婅鎬绘暟
+            errMap.put("鍛婅鏈烘埧鎬绘暟", 1);      //鍛婅鏈烘埧鎬绘暟
+            errMap.put("浣庡憡璀︽満鎴挎暟姣斾緥", 1);    //浣庡憡璀︽満鎴挎暟姣斾緥
             resultMap.put("鏁呴殰鏁伴噺", errMap);
 
             response.setCode(1);
@@ -132,9 +133,10 @@
      * @param userId
      * @return
      */
+    //TODO
     public Response<Map> getBTSEquipStatus(int userId) {
 
-        Response<Map> response = new Response();   //TODO RZG
+        Response<Map> response = new Response();
         Map<String, Object> resultMap = new HashMap<>();
         try {
 
@@ -146,11 +148,11 @@
 //        Integer chargeNO = fbs9100StateMapper.getChargeNO(devId,userId);
 //        Integer resTestNO = fbs9100StateMapper.getResTestNO(devId,userId);
 //        Integer errNO = fbs9100StateMapper.getErrNO(devId,userId);
-            resultMap.put("herongNO", herongNO);    //鏍稿鏁伴噺
-            resultMap.put("onlineFloatNO", 1);    //鍦ㄧ嚎娴厖鏁伴噺
-            resultMap.put("chargeNO", 1);    //鍏呯數鏁伴噺
-            resultMap.put("resTestNO", 1);    //鍐呴樆娴嬭瘯鏁伴噺
-            resultMap.put("errNO", 1);    //鏁呴殰鏁伴噺
+            resultMap.put("鏍稿鏁伴噺", herongNO);    //鏍稿鏁伴噺
+            resultMap.put("鍦ㄧ嚎娴厖鏁伴噺", 1);    //鍦ㄧ嚎娴厖鏁伴噺
+            resultMap.put("鍏呯數鏁伴噺", 1);    //鍏呯數鏁伴噺
+            resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", 1);    //鍐呴樆娴嬭瘯鏁伴噺
+            resultMap.put("鏁呴殰鏁伴噺", 1);    //鏁呴殰鏁伴噺
             response.setCode(1);
             response.setData(resultMap);
         } catch (Exception e) {
@@ -176,23 +178,22 @@
         try {
             //鏀剧數鐢垫祦浣庡憡璀︽暟鍜屽搴旂殑鍛婅鏈烘埧鏁�
             BatteryAlarmDto batteryAlarmDto = mapper.getLowDischargeAlarms(userId,AlarmConstant.ALM_SIGNAL_ID_DisChargeCurrLow);
-            int disChargealarmNum = batteryAlarmDto.getNum();
-            int disChargestationNum = batteryAlarmDto.getStationNum();
+            int disChargeAlarmNum = batteryAlarmDto.getNum();
+            int disChargeStationNum = batteryAlarmDto.getStationNum();
 
             //鎬诲憡璀︽暟
-            Integer totalAlarmNum = mapper.getTotalAlarms(userId);  //鏄墍鏈夌被鍨嬪憡璀︽�绘暟锛屾棤鏉′欢锛�
+            Integer totalAlarmNum = mapper.getTotalAlarms(userId);
             //鎬绘満鎴挎暟
             int totalStationNum = infoMapper.getStationCount(userId);
-            //瀹归噺浣庡憡璀﹀崰姣�
-            double disChargeLowRate = BigDecimal.valueOf(disChargealarmNum).divide(BigDecimal.valueOf(totalAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
+            //鏀剧數鐢垫祦浣庡憡璀﹀崰姣�
+            double disChargeLowRate = BigDecimal.valueOf(disChargeAlarmNum).divide(BigDecimal.valueOf(totalAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
             String disChargeLowRateStr = (int)(disChargeLowRate*100)+"%";
-            //瀹归噺浣庡憡璀︽満鎴垮崰姣�
-            double disChargeLowStationRate = BigDecimal.valueOf(disChargestationNum).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
+            //鏀剧數鐢垫祦浣庡憡璀︽満鎴垮崰姣�
+            double disChargeLowStationRate = BigDecimal.valueOf(disChargeStationNum).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
             String disChargeLowStationRateStr = (int)(disChargeLowStationRate*100)+"%";
 
-
-            resultMap.put("浣庡憡璀︽暟閲�", disChargealarmNum);     //浣庡憡璀︽暟閲� alm_signal_id:DisChargeCurr 7 high; 8 low
-            resultMap.put("鍛婅鏈烘埧鎬绘暟", disChargestationNum);      //鍛婅鏈烘埧鎬绘暟
+            resultMap.put("浣庡憡璀︽暟閲�", disChargeAlarmNum);     //浣庡憡璀︽暟閲� alm_signal_id:DisChargeCurr 7 high; 8 low
+            resultMap.put("鍛婅鏈烘埧鎬绘暟", disChargeStationNum);      //鍛婅鏈烘埧鎬绘暟
             resultMap.put("鍛婅鏈烘埧鏁版瘮渚�", disChargeLowRateStr);    //鍛婅鏈烘埧鏁版瘮渚�
             resultMap.put("鍛婅鎬绘暟", totalAlarmNum);        //鍛婅鎬绘暟
             resultMap.put("鍛婅鎬绘暟姣斾緥", disChargeLowStationRateStr);      //鍛婅鎬绘暟姣斾緥
@@ -205,34 +206,32 @@
         return response;
     }
 
-    //    鍏呯數鐢垫祦
-
     /**
-     * 鏀剧數鍜� 鍏呯數鐢垫祦
+     * 鏀剧數鍜屽厖鐢电數娴� 楂�
      * alm_id 鐢垫睜鍛婅鍙傛暟
      * @param userId
      * @return
      */
+    //TODO
     public Response<Map> getChargeAnalysis(int userId) {
 
-        Response<Map> response = new Response();   //TODO RZG
+        Response<Map> response = new Response();
         HashMap<String, Object> resultMap = new HashMap<>();
         Map<String, Integer> disCharge = new HashMap<>();//鏀剧數鐢垫祦  Alarm_curr_Discharge =119004
         Map<String, Integer> reCharge = new HashMap<>();//鍏呯數鐢垫祦   Alarm_curr_Charge =119003
 
-
-        disCharge.put("highAlarmsNO", 1);     //楂樺憡璀︽暟閲�    alm_signal_id:ChargeCurrHigh 5 high; 6 low
-        disCharge.put("totalAlarms", 1);        //鍛婅鎬绘暟
-        disCharge.put("totalAlarmsScale", 1);      //鍛婅鎬绘暟姣斾緥
-        disCharge.put("totalAlarmRooms", 1);      //鍛婅鏈烘埧鎬绘暟
-        disCharge.put("alarmRoomsScale", 1);    //鍛婅鏈烘埧鏁版瘮渚�
+        disCharge.put("楂樺憡璀︽暟閲�", 1);     //楂樺憡璀︽暟閲�    alm_signal_id:ChargeCurrHigh 5 high; 6 low
+        disCharge.put("鍛婅鎬绘暟", 1);        //鍛婅鎬绘暟
+        disCharge.put("鍛婅鎬绘暟姣斾緥", 1);      //鍛婅鎬绘暟姣斾緥
+        disCharge.put("鍛婅鏈烘埧鎬绘暟", 1);      //鍛婅鏈烘埧鎬绘暟
+        disCharge.put("鍛婅鏈烘埧鏁版瘮渚�", 1);    //鍛婅鏈烘埧鏁版瘮渚�
         resultMap.put("disCharge", disCharge);
 
-        reCharge.put("highAlarmsNO", 1);     //楂樺憡璀︽暟閲�
-        reCharge.put("totalAlarms", 1);        //鍛婅鎬绘暟
-        reCharge.put("totalAlarmsScale", 1);      //鍛婅鎬绘暟姣斾緥
-        reCharge.put("totalAlarmRooms", 1);      //鍛婅鏈烘埧鎬绘暟
-        reCharge.put("alarmRoomsScale", 1);    //鍛婅鏈烘埧鏁版瘮渚�
+        reCharge.put("楂樺憡璀︽暟閲�", 1);     //楂樺憡璀︽暟閲�
+        reCharge.put("鍛婅鎬绘暟", 1);        //鍛婅鎬绘暟
+        reCharge.put("鍛婅鎬绘暟姣斾緥", 1);      //鍛婅鎬绘暟姣斾緥
+        reCharge.put("鍛婅鏈烘埧鎬绘暟", 1);      //鍛婅鏈烘埧鎬绘暟
+        reCharge.put("鍛婅鏈烘埧鏁版瘮渚�", 1);    //鍛婅鏈烘埧鏁版瘮渚�
         resultMap.put("reCharge", reCharge);
 
         response.setCode(1);
@@ -250,94 +249,104 @@
      */
     public Response<Map> getMonVRTAnalysis(int userId) {
 
-        Response<Map> response = new Response();   //TODO RZG
+        Response<Map> response = new Response();
         HashMap<String, Object> resultMap = new HashMap<>();
         Map<String, Object> monVolMap = new HashMap<>();//鍗曚綋鐢靛帇  Alarm_vol_Monomer =119005;
         Map<String, Object> monResMap = new HashMap<>();//鍗曚綋鍐呴樆  Alarm_res_Monomer =119007
         Map<String, Object> monTemMap = new HashMap<>();//鍗曚綋娓╁害  Alarm_tmp_Monomer =119006
 
-
-
-//     ******************************************鍗曚綋鐢靛帇****************************************************************
+        /*======鍗曚綋鐢靛帇======*/
 
         //楂樺憡璀︽暟閲�
-        Integer volhighAlarmsNum = mapper.getVolAlamHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonVolHigh);
+        Integer volHighAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonVolHigh);
         //浣庡憡璀︽暟閲�
-        Integer vollowAlarmsNum = mapper.getVolAlamHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonVolLow);
+        Integer volLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonVolLow);
 
-        //鍗曚綋鐢靛帇銆佸唴闃诲拰娓╁害 鎬诲憡璀︽暟
-        Integer voltotalAlarmNum = mapper.getVRTTotalAlarms(userId,AlarmConstant.Alarm_vol_Monomer);
-//        Integer restotalAlarmNum = mapper.getVRTTotalAlarms(userId,AlarmConstant.Alarm_res_Monomer);
-//        Integer temtotalAlarmNum = mapper.getVRTTotalAlarms(userId,AlarmConstant.Alarm_tmp_Monomer);
+        //鍗曚綋鐢靛帇鎬诲憡璀︽暟
+        Integer volTotalAlarmNum = volHighAlarmsNum+volLowAlarmsNum;
 
-        //鍗曚綋鐢靛帇鏈烘埧鍛婅鎬绘暟
-        Integer voltotalStationAlarmNum =mapper.getVRTTotalAlarms(userId,AlarmConstant.Alarm_tmp_Monomer);
+        //鍛婅鎬绘暟
+        Integer totalStationAlarmNum =mapper.getTotalAlarms(userId);
+
+        //鐢靛帇鍛婅鏈烘埧鏁�
+        int volTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_vol_Monomer);
 
         //鎬绘満鎴挎暟
         int totalStationNum = infoMapper.getStationCount(userId);
 
         //鐢靛帇鍛婅鍗犳瘮
-        double volRate = BigDecimal.valueOf(volhighAlarmsNum+vollowAlarmsNum).divide(BigDecimal.valueOf(voltotalAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
+        double volRate = BigDecimal.valueOf(volTotalAlarmNum).divide(BigDecimal.valueOf(totalStationAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
         String volRateStr = (int)(volRate*100)+"%";
         //鐢靛帇鍛婅鏈烘埧鍗犳瘮
-        double volStationRate = BigDecimal.valueOf(voltotalAlarmNum).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
+        double volStationRate = BigDecimal.valueOf(volTotalAlarmStations).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
         String volStationRateStr = (int)(volStationRate*100)+"%";
 
 
-        monVolMap.put("楂樺憡璀︽暟閲�", volhighAlarmsNum);     //楂樺憡璀︽暟閲�    alm_signal_id 9
-        monVolMap.put("浣庡憡璀︽暟閲�", vollowAlarmsNum);     //浣庡憡璀︽暟閲�     alm_signal_id   10
-        monVolMap.put("鍛婅鎬绘暟", voltotalAlarmNum);        //鍛婅鎬绘暟
+        monVolMap.put("楂樺憡璀︽暟閲�", volHighAlarmsNum);     //楂樺憡璀︽暟閲�    alm_signal_id 9
+        monVolMap.put("浣庡憡璀︽暟閲�", volLowAlarmsNum);     //浣庡憡璀︽暟閲�     alm_signal_id   10
+        monVolMap.put("鍛婅鎬绘暟", volTotalAlarmNum);        //鍛婅鎬绘暟
         monVolMap.put("鍛婅鎬绘暟姣斾緥", volRateStr);      //鍛婅鎬绘暟姣斾緥
-        monVolMap.put("鍛婅鏈烘埧鎬绘暟", voltotalStationAlarmNum);      //鍛婅鏈烘埧鎬绘暟
+        monVolMap.put("鍛婅鏈烘埧鎬绘暟", volTotalAlarmStations);      //鍛婅鏈烘埧鎬绘暟
         monVolMap.put("鍛婅鏈烘埧鏁版瘮渚�", volStationRateStr);    //鍛婅鏈烘埧鏁版瘮渚�
         resultMap.put("鍗曚綋鐢靛帇", monVolMap);
 
 
 
-//     ******************************************鍗曚綋鍐呴樆****************************************************************
+        /*======鍗曚綋鍐呴樆======*/
 
-        Integer reshighAlarmsNum = mapper.getResistanceAlamHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonResHigh);
-        Integer reslowAlarmsNum = mapper.getResistanceAlamHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonResLow);
+        //楂樺憡璀︽暟閲�
+        Integer resHighAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonResHigh);
+        //浣庡憡璀︽暟閲�
+        Integer resLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonResLow);
 
-        //鍗曚綋鐢靛帇銆佸唴闃诲拰娓╁害 鎬诲憡璀︽暟
-        Integer restotalAlarmNum = mapper.getVRTTotalAlarms(userId,AlarmConstant.Alarm_res_Monomer);
-        //鍛婅鏈烘埧鎬绘暟
-        Integer restotalStationAlarmNum =mapper.getVRTTotalAlarms(userId,AlarmConstant.Alarm_tmp_Monomer);
-        //鎬绘満鎴挎暟
-//        int totalStationNum = infoMapper.getStationCount(userId);
+        //鍗曚綋鍐呴樆鎬诲憡璀︽暟
+        Integer resTotalAlarmNum = resHighAlarmsNum+resLowAlarmsNum;
+
+        //鍐呴樆鍛婅鏈烘埧鏁�
+        int resTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_res_Monomer);
 
         //鍐呴樆鍛婅鍗犳瘮
-        double resRate = BigDecimal.valueOf(reshighAlarmsNum+reslowAlarmsNum).divide(BigDecimal.valueOf(restotalAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
+        double resRate = BigDecimal.valueOf(resTotalAlarmNum).divide(BigDecimal.valueOf(totalStationAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
         String resRateStr = (int)(resRate*100)+"%";
-        //鍐呴樆鍛婅鏈烘埧鍗犳瘮  TODO
-        double resStationRate = BigDecimal.valueOf(restotalStationAlarmNum).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
+        //鍐呴樆鍛婅鏈烘埧鍗犳瘮
+        double resStationRate = BigDecimal.valueOf(resTotalAlarmStations).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
         String resStationRateStr = (int)(resStationRate*100)+"%";
 
-        monResMap.put("楂樺憡璀︽暟閲�", reshighAlarmsNum);     //楂樺憡璀︽暟閲�    alm_signal_id 13
-        monResMap.put("浣庡憡璀︽暟閲�", reslowAlarmsNum);     //浣庡憡璀︽暟閲�     alm_signal_id 14
-        monResMap.put("鍛婅鎬绘暟", restotalAlarmNum);        //鍛婅鎬绘暟
+        monResMap.put("楂樺憡璀︽暟閲�", resHighAlarmsNum);     //楂樺憡璀︽暟閲�    alm_signal_id 13
+        monResMap.put("浣庡憡璀︽暟閲�", resLowAlarmsNum);     //浣庡憡璀︽暟閲�     alm_signal_id 14
+        monResMap.put("鍛婅鎬绘暟", resTotalAlarmNum);        //鍛婅鎬绘暟
         monResMap.put("鍛婅鎬绘暟姣斾緥", resRateStr);      //鍛婅鎬绘暟姣斾緥
-        monResMap.put("鍛婅鏈烘埧鎬绘暟", restotalStationAlarmNum);      //鍛婅鏈烘埧鎬绘暟
+        monResMap.put("鍛婅鏈烘埧鎬绘暟", resTotalAlarmStations);      //鍛婅鏈烘埧鎬绘暟
         monResMap.put("鍛婅鏈烘埧鏁版瘮渚�", resStationRateStr);    //鍛婅鏈烘埧鏁版瘮渚�
         resultMap.put("鍗曚綋鍐呴樆", monResMap);
 
+        /*======鍗曚綋娓╁害======*/
 
+        //楂樺憡璀︽暟閲�
+        Integer tempHighAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonTmpHigh);
+        //浣庡憡璀︽暟閲�
+        Integer tempLowAlarmsNum = mapper.getAlarmHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonTmpLow);
 
-//     ******************************************鍗曚綋娓╁害****************************************************************
+        //鍗曚綋娓╁害鎬诲憡璀︽暟
+        Integer tempTotalAlarmNum = tempHighAlarmsNum+tempLowAlarmsNum;
 
+        //娓╁害鍛婅鏈烘埧鏁�
+        int tempTotalAlarmStations = mapper.getTotalAlarmStations(userId,AlarmConstant.Alarm_tmp_Monomer);
 
-/*        Integer temhighAlarmsNum = mapper.getTemperatureAlamHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonTmpHigh);
-        Integer temlowAlarmsNum = mapper.getTemperatureAlamHighLow(userId,AlarmConstant.ALM_SIGNAL_ID_MonTmpLow);
-        monTemMap.put("highAlarmsNO", temhighAlarmsNum);     //楂樺憡璀︽暟閲�    alm_signal_id 11
-        monTemMap.put("lowAlarmsNO", temlowAlarmsNum);     //浣庡憡璀︽暟閲�     alm_signal_id 12
+        //娓╁害鍛婅鍗犳瘮
+        double tempRate = BigDecimal.valueOf(tempTotalAlarmNum).divide(BigDecimal.valueOf(totalStationAlarmNum), 2, RoundingMode.HALF_UP).doubleValue();
+        String tempRateStr = (int)(tempRate*100)+"%";
+        //娓╁害鍛婅鏈烘埧鍗犳瘮
+        double tempStationRate = BigDecimal.valueOf(tempTotalAlarmStations).divide(BigDecimal.valueOf(totalStationNum), 2, RoundingMode.HALF_UP).doubleValue();
+        String tempStationRateStr = (int)(tempStationRate*100)+"%";
 
-        monTemMap.put("totalAlarms", 1);        //鍛婅鎬绘暟
-        monTemMap.put("totalAlarmsScale", 1);      //鍛婅鎬绘暟姣斾緥
-
-
-        monTemMap.put("totalAlarmRooms", 1);      //鍛婅鏈烘埧鎬绘暟
-        monTemMap.put("alarmRoomsScale", 1);    //鍛婅鏈烘埧鏁版瘮渚�
-        resultMap.put("monTemMap", monTemMap);*/
+        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);    //鍛婅鏈烘埧鏁版瘮渚�
+        resultMap.put("鍗曚綋娓╁害", monTemMap);
 
         response.setCode(1);
         response.setData(resultMap);

--
Gitblit v1.9.1