美维大屏修改2

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/EartagAbnormalAlarmServiceImpl.java

@@ -80,10 +80,11 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
     public Result getHealthy(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         //监测数量
-        Long count = eartagEartagRegister2Mapper.selectCount(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmId));
+        Long count = eartagEartagRegister2Mapper.selectCount(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmId)
+                .ge("register_time","2023-12-01 00:00:00"));
         //群体温度，环境温度
         QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id", farmId).ge("ear_temp1", 30);
+        wrapper.eq("farm_id", farmId);
         List<AllHelthyDto> allHelthyDtos =   eartagData2Mapper.allHealthy2(wrapper);
         String eartagTemp = "0";
         String envTemp= "0";
@@ -173,10 +174,10 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
 //            }
             Date parse = sdf.parse(eartagEartagRegister2.getAskTime());
             if (time.compareTo(parse) < 0) {
-                if (eartagEartagRegister2.getEarTemp1() < 30 || eartagEartagRegister2.getEarTemp1() > 35 ) {
-                    String num = NumberUtils.getNum(32, 34, 1);
-                    eartagEartagRegister2.setEarTemp1(Float.parseFloat(num));
-                }
+//                if (eartagEartagRegister2.getEarTemp1() < 30 || eartagEartagRegister2.getEarTemp1() > 35 ) {
+//                    String num = NumberUtils.getNum(32, 34, 1);
+//                    eartagEartagRegister2.setEarTemp1(Float.parseFloat(num));
+//                }
                 if (eartagEartagRegister2.getAct() > 300) {
                     Random rand = new Random();
                     Integer result = (rand.nextInt(200 - 100) + 100);