美维大屏修改

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

@@ -35,5 +35,5 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
 
     Result getHealthy(Map<String, String> paramsMap);
 
-    Result getSheepHealthy(Map<String, String> paramsMap);
+    Result getSheepHealthy(Map<String, String> paramsMap) throws ParseException;
 }

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static javafx.scene.input.KeyCode.L;
@@ -82,7 +83,7 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         Long count = eartagEartagRegister2Mapper.selectCount(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmId));
         //群体温度，环境温度
         QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq("farm_id", farmId).ge("ear_temp1", 30);
         List<AllHelthyDto> allHelthyDtos =   eartagData2Mapper.allHealthy2(wrapper);
         String eartagTemp = "0";
         String envTemp= "0";
@@ -140,7 +141,7 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
     }
 
     @Override
-    public Result getSheepHealthy(Map<String, String> paramsMap) {
+    public Result getSheepHealthy(Map<String, String> paramsMap) throws ParseException {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id",farmId).orderByDesc("ask_time");
@@ -159,27 +160,37 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
 //           wrapper.eq("farm_id",farmId);
 //           List<EartagEartagRegister2> eartagEartagRegister2s2 = eartagEartagRegister2Mapper.selectList(wrapper);
 //           int size2 = eartagEartagRegister2s2.size();
+        int days = 5;
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_YEAR, -days);
+        Date time = calendar.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<EartagEartagRegister2> list = new ArrayList<>();
         for (EartagEartagRegister2 eartagEartagRegister2 : eartagEartagRegister2s) {
 //            if (eartagEartagRegister2.getEarTemp1() > 40) {
 //                String num = NumberUtils.getNum(36, 38, 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);
-                BigDecimal bigDecimal = new BigDecimal(result);
-                eartagEartagRegister2.setAct(bigDecimal.longValue());
-            }
-            if (eartagEartagRegister2.getAct() < 0) {
-                eartagEartagRegister2.setAct(0L);
+            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.getAct() > 300) {
+                    Random rand = new Random();
+                    Integer result = (rand.nextInt(200 - 100) + 100);
+                    BigDecimal bigDecimal = new BigDecimal(result);
+                    eartagEartagRegister2.setAct(bigDecimal.longValue());
+                }
+                if (eartagEartagRegister2.getAct() < 0) {
+                    eartagEartagRegister2.setAct(0L);
+                }
+                list.add(eartagEartagRegister2);
             }
         }
 //       }
-        return ResultUtil.isNull(eartagEartagRegister2s);
+        return ResultUtil.isNull(list);
     }
 
     @Override