Browse Source

新建今日报警功能(大屏)。

zhuoning 3 years ago
parent
commit
086fac7af5

+ 1 - 1
huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/controller/AlarmController.java

@@ -68,7 +68,7 @@ public class AlarmController {
 
     //查询今日各类警报占比
     @RequestMapping(value = "/getTodayAlarmRate",method = RequestMethod.GET)
-    public Result getTodayAlarmRate(@RequestParam(value = "farmId",required = true) Integer farmId){
+    public Result getTodayAlarmRate(@RequestParam(value = "farmId",required = true) Integer farmId) throws ParseException {
         log.info("farmId>>"+farmId);
         //
         return iAlarm.getAlarmRate(farmId);

+ 4 - 0
huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/dao/repo/BaseWarningInfoRepo.java

@@ -16,4 +16,8 @@ public interface BaseWarningInfoRepo extends JpaRepository<BaseWarningInfoEntity
     //查询最近7天警报数据
     @Query(nativeQuery = true,value ="SELECT * FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')>=DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(warning_time,'%Y-%m-%d')<=DATE_FORMAT(?3,'%Y-%m-%d')")
     List<BaseWarningInfoEntity> findLastSevenDaysAlarm(Integer farmId, String startDate, String endDate);
+
+    //查询今天所有报警记录
+    @Query(nativeQuery = true,value ="SELECT * FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d')")
+    List<BaseWarningInfoEntity> findTodayAllAlarm(Integer farmId, String todayText);
 }

+ 1 - 1
huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/service/IAlarm.java

@@ -14,5 +14,5 @@ public interface IAlarm {
 
     Result getOneWeekAlarm(Integer farmId) throws ParseException;
 
-    Result getAlarmRate(Integer farmId);
+    Result getAlarmRate(Integer farmId) throws ParseException;
 }

+ 30 - 2
huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/service/impl/AlarmImpl.java

@@ -195,7 +195,35 @@ public class AlarmImpl implements IAlarm {
     }
 
     @Override
-    public Result getAlarmRate(Integer farmId) {
-        return null;
+    public Result getAlarmRate(Integer farmId) throws ParseException {
+        String todayText = dateUtil.getTodayDateText();
+        //查询今天所有报警记录
+        List<BaseWarningInfoEntity> warningInfoEntityList = warningInfoRepo.findTodayAllAlarm(farmId,todayText);
+        if(warningInfoEntityList.size()>0){
+            JSONArray outJa = new JSONArray();
+            //
+            JSONObject dataJo1 = new JSONObject();
+            outJa.add(dataJo1);
+            dataJo1.put("name","生态监测");
+            dataJo1.put("value",25);
+            //
+            JSONObject dataJo2 = new JSONObject();
+            outJa.add(dataJo2);
+            dataJo2.put("name","环境监测");
+            dataJo2.put("value",30);
+            //
+            JSONObject dataJo3 = new JSONObject();
+            outJa.add(dataJo3);
+            dataJo3.put("name","人员违规");
+            dataJo3.put("value",45);
+            //
+            JSONObject dataJo4 = new JSONObject();
+            outJa.add(dataJo4);
+            dataJo4.put("name","报警总量");
+            dataJo4.put("value",100);
+            return new Result(ResultCode.SUCCESS,outJa);
+        }else{
+            return new Result(Const.ERROR_CODE_NOTEXIST,Const.ERROR_MSG_NOTEXIST,false);
+        }
     }
 }