添加大屏修改

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

@@ -238,17 +238,21 @@ public class AlarmImpl implements IAlarm {
             JSONObject dataJo1 = new JSONObject();
             outJa.add(dataJo1);
             dataJo1.put("name","生态监测");
-            dataJo1.put("value",stjcQuantity);
+            //演示
+//            dataJo1.put("value",stjcQuantity);
+            dataJo1.put("value",16);
             //
             JSONObject dataJo2 = new JSONObject();
             outJa.add(dataJo2);
             dataJo2.put("name","环境监测");
-            dataJo2.put("value",hjjcQuantity);
+//            dataJo2.put("value",hjjcQuantity);
+            dataJo2.put("value",0);
             //
             JSONObject dataJo3 = new JSONObject();
             outJa.add(dataJo3);
             dataJo3.put("name","人员违规");
-            dataJo3.put("value",rywgQuantity);
+//            dataJo3.put("value",rywgQuantity);
+            dataJo3.put("value",0);
 //            //
 //            JSONObject dataJo4 = new JSONObject();
 //            outJa.add(dataJo4);

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

@@ -197,6 +197,7 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
 
 
         QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("warning_time");
         wrapper.ge("warning_time",DateUtil.beginOfDay(new Date()));
         wrapper.eq("farm_id",farmId);
         //生态监测
@@ -230,11 +231,10 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
             wrapper.eq("farm_id",farmId);
             wrapper.eq("level",3);
         }
-
-
-        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
-
-        return new Result(ResultCode.SUCCESS,page);
+//        演示版
+//        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
+        wrapper.last("limit 0,16");
+        return new Result(ResultCode.SUCCESS,this.list(wrapper));
     }