【feat】查询打耳标流水

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -935,7 +935,7 @@ public class EartagServiceImpl implements IEartagService {
         dataEntity.setAddTime(nowTimestamp);
         dataEntity.setCreateDate(todayDate);
         dataEntity.setFarmId(farmId);
-        dataEntity.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
+//        dataEntity.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
         eartagDataRepo.saveAndFlush(dataEntity);
 
         //最新的耳标数据覆盖老数据
@@ -993,7 +993,7 @@ public class EartagServiceImpl implements IEartagService {
             dataEntity.setAddTime(nowTimestamp);
             dataEntity.setCreateDate(todayDate);
             dataEntity.setFarmId(farmId);
-            dataEntity.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
+//            dataEntity.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
             eartagData2EntityRepo.saveAndFlush(dataEntity);
 
             //更新耳标注册表中的运动量数据

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegister2ServiceImpl.java

@@ -67,7 +67,11 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         List<EartagEartagRegister2> list = this.list(wrapper);
         for (EartagEartagRegister2 record : list) {
             Float earTemp1 = record.getEarTemp1();
-            maxEarTemp = Math.max(earTemp1,maxEarTemp);
+            //吴老师要求，屏蔽耳标
+            if (earTemp1 <41.9){
+                maxEarTemp = Math.max(earTemp1,maxEarTemp);
+            }
+
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }