新建大屏获取当天警报记录

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

@@ -59,11 +59,10 @@ public class AlarmController {
     //查询今天的警报
     @RequestMapping(value = "/getTodayAlarm",method = RequestMethod.GET)
     public Result getTodayAlarmByFarmId(@RequestParam(value = "farmId",required = true) Integer farmId,
-                                               @RequestParam(value = "quantity",required=true) Integer quantity     ) throws ParseException {
+                                        @RequestParam(value = "quantity",required=true) Integer quantity     ) throws ParseException {
         log.info("farmId>>"+farmId);
         log.info("quantity>>"+quantity);
         //
-//        return iAlarm.getAlarm(farmId,alarmType,alarmDate,pageNo,pageSize);
         return iAlarm.getAlarm(farmId,quantity);
     }
 }

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

@@ -10,6 +10,6 @@ import java.util.List;
 public interface BaseWarningInfoRepo extends JpaRepository<BaseWarningInfoEntity, Integer>, JpaSpecificationExecutor<BaseWarningInfoEntity> {
 
     //查询今天的N条记录
-    @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') ORDER BY id DESC LIMIT ?3")
-    List<BaseWarningInfoEntity> findTodayAlarm(Integer farmId, String today, Integer quantity);
+    @Query(nativeQuery = true,value ="SELECT level_name,DATE_FORMAT(warning_time,'%T') warning_time,msg FROM base_warning_info where farm_id=?1 AND DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY id DESC LIMIT ?3")
+    List<Object[]> findTodayAlarm(Integer farmId, String today, Integer quantity);
 }

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

@@ -1,5 +1,7 @@
 package com.huimv.env.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.dao.entity.BaseWarningInfoEntity;
@@ -138,10 +140,19 @@ public class AlarmImpl implements IAlarm {
         String today = dateUtil.getTodayDateText();
         System.out.println("today>>"+today);
         //
-        List<BaseWarningInfoEntity>  warningInfoEntityList = warningInfoRepo.findTodayAlarm(farmId,today,quantity);
+        List<Object[]>  warningInfoEntityList = warningInfoRepo.findTodayAlarm(farmId,today,quantity);
         System.out.println("size>>"+warningInfoEntityList.size());
         if(warningInfoEntityList.size()>0){
-            return new Result(ResultCode.SUCCESS,warningInfoEntityList);
+            JSONArray alarmJa = new JSONArray();
+            for(int a=0;a<warningInfoEntityList.size();a++){
+                Object[] alarmObj = (Object[]) warningInfoEntityList.get(a);
+                JSONObject alarmJo = new JSONObject();
+                alarmJa.add(alarmJo);
+                alarmJo.put("levelName",alarmObj[0]);
+                alarmJo.put("warningTime",alarmObj[1]);
+                alarmJo.put("msg",alarmObj[2]);
+            }
+            return new Result(ResultCode.SUCCESS,alarmJa);
         }else{
             return new Result(Const.ERROR_CODE_NOTEXIST,Const.ERROR_MSG_NOTEXIST,false);
         }