解决耳标详情报错的问题

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -150,8 +150,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         return  new PageUtils(page);
     }
 
-
-
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<EartagDataEntity> page = this.page(
@@ -186,17 +184,23 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         Map<String ,Object>    map1 = new HashMap<>();
         map1.put("Registentity",collectorRegisterEntity);//耳标所在的机器信息
 
+        //倒数两条
         LambdaQueryWrapper<MovePigpenEntity> wrapper2 = Wrappers.lambdaQuery();
         wrapper2.eq(MovePigpenEntity::getEartagNo , earTagData.getEartagNo()).orderByDesc( MovePigpenEntity::getId ).last( "limit 2");
         List<MovePigpenEntity> movePigpenEntities = movePigpenDao.selectList(wrapper2);
 
+
+        //时间最开始的一条
         LambdaQueryWrapper<MovePigpenEntity> wrapper23 = Wrappers.lambdaQuery();
         wrapper23.eq(MovePigpenEntity::getEartagNo , earTagData.getEartagNo()).orderByAsc( MovePigpenEntity::getId ).last( "limit 1");
         MovePigpenEntity  movePigpen = movePigpenDao.selectOne(wrapper23);
+
+
         movePigpenEntities.add(movePigpen);
+
         System.out.println(movePigpenEntities+"opop");
+    if ( movePigpen!=null ) {
 
-    if (movePigpen!=null) {
         List<Object> movePigpe111 = new ArrayList<>();
         for (MovePigpenEntity movePigpenEntity : movePigpenEntities) {
             Map<String, Object> movePigpenEntitiesmap = new HashMap<>();
@@ -213,6 +217,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             LambdaQueryWrapper<BasePigpenEntity> wrapper5 = Wrappers.lambdaQuery();
             wrapper5.eq(BasePigpenEntity::getId, collectorRegisterEntit.getUnitId());//单元
             BasePigpenEntity basePigpenEnt2 = basePigpenDao.selectOne(wrapper4);
+
             TempMovePenEntity tempMovePenEntity = new TempMovePenEntity();
             tempMovePenEntity.setDeviceCode(movePigpenEntity.getDeviceCode());
             tempMovePenEntity.setEartagNo(movePigpenEntity.getEartagNo());
@@ -223,12 +228,11 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             tempMovePenEntity.setStage(movePigpenEntity.getStage());
             movePigpe111.add(tempMovePenEntity);
         }
+
         map1.put("movePigPenData",movePigpe111);
     }
-
-
+        map1.put("movePigPenData",null);
         map1.put("eartagdeta",earTagData);  //点击的耳标信息
-        map1.put("movePigpen",movePigpenEntities);   //需要分解成首次，上一次，现在---三种情况--缺位置信息。需要添加位置信息
 
         //获取运动等信息
         String eartag = earTagData.getEartagNo();
@@ -305,7 +309,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
                      System.out.println(data.getEarTemp());
                  }
              }
-
              System.out.println("结果"+totlatemp+a+totlatemp/a);
              //直接三元
              if(totlatemp/a>0.01){