修改首页报警数量多牧场切换。

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/AlarmServiceImpl.java

@@ -73,37 +73,40 @@ public class AlarmServiceImpl implements IAlarmService {
 
     //事件提醒
     private String getEventTotal(Integer farmId) throws ParseException, ClientException {
-        //获取人员违规
-        String startTime = dateUtil.getTodayDateText() + " 00:00:00";
-        log.info("今日事件提醒.开始时间>>" + startTime);
-        String endTime = dateUtil.getTodayDateText() + " 23:59:59";
-        log.info("今日事件提醒.结束时间>>" + endTime);
+        if(farmId == 1) {
+            //获取人员违规
+            String startTime = dateUtil.getTodayDateText() + " 00:00:00";
+            log.info("今日事件提醒.开始时间>>" + startTime);
+            String endTime = dateUtil.getTodayDateText() + " 23:59:59";
+            log.info("今日事件提醒.结束时间>>" + endTime);
 
-        //人员违规事件数量
-        String personAlarmTotal = SendMassageGetPagePersonAlarm(startTime, endTime);
-        log.info("人员违规事件数量>>"+personAlarmTotal);
-        Integer rywgQuantity = 0;
-        if (personAlarmTotal != null) {
-            rywgQuantity = Integer.parseInt(personAlarmTotal);
-        }
-        //车辆闸机事件数量
-        String carEventTimes = SendMassageGetPage(startTime,endTime);
-        log.info("车辆闸机事件数量>>"+carEventTimes);
-        Integer carEventTimesInt = 0;
-        if(carEventTimes != null){
-            carEventTimesInt = Integer.parseInt(carEventTimes);
-        }
-        //周界检测事件数量
-        String borderEventTimes = getBorderEvent(startTime,endTime);
-        log.info("周界检测事件数量>>"+borderEventTimes);
-        Integer borderEventTimesInt = 0;
-        if(borderEventTimes != null){
-            borderEventTimesInt = Integer.parseInt(borderEventTimes);
+            //人员违规事件数量
+            String personAlarmTotal = SendMassageGetPagePersonAlarm(startTime, endTime);
+            log.info("人员违规事件数量>>" + personAlarmTotal);
+            Integer rywgQuantity = 0;
+            if (personAlarmTotal != null) {
+                rywgQuantity = Integer.parseInt(personAlarmTotal);
+            }
+            //车辆闸机事件数量
+            String carEventTimes = SendMassageGetPage(startTime, endTime);
+            log.info("车辆闸机事件数量>>" + carEventTimes);
+            Integer carEventTimesInt = 0;
+            if (carEventTimes != null) {
+                carEventTimesInt = Integer.parseInt(carEventTimes);
+            }
+            //周界检测事件数量
+            String borderEventTimes = getBorderEvent(startTime, endTime);
+            log.info("周界检测事件数量>>" + borderEventTimes);
+            Integer borderEventTimesInt = 0;
+            if (borderEventTimes != null) {
+                borderEventTimesInt = Integer.parseInt(borderEventTimes);
+            }
+            //所有事件累计
+            Integer allEventInt = rywgQuantity + carEventTimesInt + borderEventTimesInt;
+            log.info("今日事件总数量>>" + allEventInt);
+            return allEventInt + "次";
         }
-        //所有事件累计
-        Integer allEventInt = rywgQuantity + carEventTimesInt + borderEventTimesInt;
-        log.info("今日事件总数量>>"+allEventInt);
-        return allEventInt+"次";
+        return "0次";
     }
 
     //周界检测事件数量
@@ -183,10 +186,12 @@ public class AlarmServiceImpl implements IAlarmService {
             String endTime = dateUtil.getTodayDateText() + " 23:59:59";
             log.info("结束时间>>" + endTime);
             //获取人员违规
-            String personAlarmTotal = SendMassageGetPagePersonAlarm(startTime, endTime);
             int rywgQuantity = 0;
-            if (personAlarmTotal != null) {
-                rywgQuantity = Integer.parseInt(personAlarmTotal);
+            if(farmId == 1) {
+                String personAlarmTotal = SendMassageGetPagePersonAlarm(startTime, endTime);
+                if (personAlarmTotal != null) {
+                    rywgQuantity = Integer.parseInt(personAlarmTotal);
+                }
             }
             //报警总量
             int total = stjcQuantity + hjjcQuantity + rywgQuantity;