修改了耳标数据展示的部分Bug

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

@@ -67,7 +67,11 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         String bat = (String) params.get("bat");//电量
         String dayAge2 = (String) params.get("dayage2");//日龄
 
+        System.out.println("采集器+condition---"+deviceCode+"耳标号"+eartagNo);
+        //只要首页限制在第一页，其余的不需要的
+
         LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
+
         if(StringUtils.isNotEmpty(farmID)){  //StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)
             wrapper.eq(EartagDataEntity::getFarmCode, farmID );
         }
@@ -75,7 +79,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             wrapper.eq(EartagDataEntity::getEartagNo, eartagNo );
         }
         if(StringUtilsWork.isNotBlank(deviceCode)){
-            wrapper.eq(EartagDataEntity::getEartagNo, deviceCode );
+            wrapper.eq(EartagDataEntity::getDeviceCode, deviceCode );
         }
         if(StringUtilsWork.isNotBlank(starttime)&StringUtilsWork.isNotBlank(endtime)) {
             System.out.println(starttime+"***shijian**"+endtime);
@@ -87,7 +91,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             //过滤时间
             wrapper.between(EartagDataEntity::getTime, startTime, endTime);
         }
-
         if (StringUtilsWork.isNotBlank(dayAge)){
             wrapper.eq(EartagDataEntity::getDayAge, dayAge );
         }
@@ -106,15 +109,24 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         if (StringUtilsWork.isNotBlank(highEnvTemp)&StringUtilsWork.isNotBlank(lowEnvTemp)){
             wrapper.between(EartagDataEntity::getEnvTemp, highEnvTemp, lowEnvTemp);
         }
-        wrapper.groupBy(EartagDataEntity::getEartagNo)
-         .orderByDesc( EartagDataEntity::getId );
+        wrapper.orderByDesc( EartagDataEntity::getId );
 
+        List<EartagDataEntity> records;
+        IPage<EartagDataEntity>  page;
+        if(StringUtilsWork.isNotBlank(eartagNo)){
+            System.out.println("有耳标号，展示耳标所有数据");
+             page = this.page((new Query<EartagDataEntity>().getPage(params)),wrapper);
+             records = page.getRecords();  //获取信息
+
+        }else{
+            System.out.println("没有耳标号，展示最新");
+              wrapper.groupBy(EartagDataEntity::getEartagNo);
+             page = baseMapper.page(new Query<EartagDataEntity>().getPage(params), wrapper);
+            records = page.getRecords();  //获取信息
+        }
 
-//        IPage<EartagDataEntity>  page =  this.page((new Query<EartagDataEntity>().getPage(params)),wrapper);
-        IPage<EartagDataEntity> page = baseMapper.page(new Query<EartagDataEntity>().getPage(params), wrapper);
-        //拼接栋舍信息在里面
-        List<EartagDataEntity> records = page.getRecords();  //获取信息
 
+        //拼接栋舍信息在里面
         for (EartagDataEntity record : records) {
             //这一页的数据
             System.out.println("数据record"+records);
@@ -123,24 +135,21 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             MovePigpenEntity  movePigpen = movePigpenDao.selectOne(wrapper23);
             System.out.println("转舍信息"+movePigpen+"转舍耳标号"+record.getEartagNo());
             //获取注册---注册信息为空
-
             LambdaQueryWrapper<CollectorRegisterEntity> wrapper3 = Wrappers.lambdaQuery();
             wrapper3.eq(CollectorRegisterEntity::getDeviceCode, record.getDeviceCode()  );
             CollectorRegisterEntity collectorRegisterEntity = collectorRegisterDao.selectOne(wrapper3);
             System.out.println("注册表信息"+collectorRegisterEntity);
 
-
             LambdaQueryWrapper<BasePigpenEntity> wrapper4 = Wrappers.lambdaQuery();
             wrapper4.eq(BasePigpenEntity::getId, collectorRegisterEntity.getPigpenId() );
             BasePigpenEntity basePigpenEntity = basePigpenDao.selectOne(wrapper4);
             System.out.println("栋舍信息"+basePigpenEntity);
 
-
             LambdaQueryWrapper<BasePigpenEntity> wrapper5 = Wrappers.lambdaQuery();
             wrapper5.eq(BasePigpenEntity::getId, collectorRegisterEntity.getUnitId() );
             BasePigpenEntity basePigpenEntity1 = basePigpenDao.selectOne(wrapper5);
-             record.setVersion(basePigpenEntity.getPigpenName());//这个多余字段存猪舍名字
-             record.setCommand(basePigpenEntity1.getPigpenName());//这个多余字段存单元名字
+            record.setVersion(basePigpenEntity.getPigpenName());//这个多余字段存猪舍名字
+            record.setCommand(basePigpenEntity1.getPigpenName());//这个多余字段存单元名字
             //格式化传入的时---第一条不应该没有----但是新耳标上来没有存信息
             if (movePigpen!=null) {
                 record.setTail(DateUtilsPublic.dateToString(movePigpen.getMoveDate()));//配标时间
@@ -149,6 +158,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         return  new PageUtils(page);
     }
 
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<EartagDataEntity> page = this.page(
@@ -159,7 +169,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
     }
 
 
-
        //想办法把平均温度计算到表里面去
     @Override
     public Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException {

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -114,18 +114,13 @@ public class ReceivePackageSerivce {
        // System.out.println(deviceCode);
 
         //wendu cha dayu 8
-        if(Double.parseDouble(env_temp)/100-setEarTemp11>8|| Double.parseDouble(env_temp)/100-setEarTemp11<-8){
+      /*  if(Double.parseDouble(env_temp)/100==0){
             //与注册表不同，，不存
             System.out.println("丢弃");
             return "hm+6+0+6+end";
-        }
+        }*/
 
 
-if(!eartagRegisterEntity.getDeviceCode().equals(device_code) ){
-    //与注册表不同，，不存
-    System.out.println("丢弃");
-    return "hm+6+0+6+end";
-}
         System.out.println("存储");
         //日龄
         eartagDataEntity.setDayAge2(eartagRegisterEntity.getAge());
@@ -153,8 +148,6 @@ if(!eartagRegisterEntity.getDeviceCode().equals(device_code) ){
            movePigpenEntity.setStage(collectorRegisterEntity.getStage());
            movePigpenService.save(movePigpenEntity);
 
-
-
            if(eartagRegisterEntity1==null){
              //说明之前没有注册过--现在注册一下--设备ID的设置留给定时任务
                EartagRegisterEntity eartagRegisterEntity2 = new EartagRegisterEntity();
@@ -176,6 +169,24 @@ if(!eartagRegisterEntity.getDeviceCode().equals(device_code) ){
            return "hm+6+0+6+end";
      }
 
+
+
+
+        if(!eartagRegisterEntity.getDeviceCode().equals(device_code) ){
+            //与注册表不同，，不存
+            System.out.println("丢弃");
+            return "hm+6+0+6+end";
+        }
+      if( Double.parseDouble(new DecimalFormat("#,##0.00").format(( Double.parseDouble(env_temp)/100))) <1.0){
+          //与注册表不同，，不存
+          System.out.println("丢弃环境温度为0");
+          return "hm+6+0+6+end";
+      }
+
+
+
+
+
         //上一条不为空---而且判断是存储注册表device-code
         //存储转舍信息--还要判断新的设备阶段和老的设备阶段是否相同，如果相同就不存储转舍信息
         if(!lastEarTagDate.getDeviceCode().equals(device_code)){

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/SendPackageService.java

@@ -50,9 +50,6 @@ public class SendPackageService {
         return "hm+1+0+"+collectorRegisterEntity.getDeviceCode()+"+520+8+end";
     }
 
-
-
-
     /**
      * @Method      : _handleGetServerDateTime
      * @Description : 获取获取服务器日期时间

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/util/Result.java

@@ -35,6 +35,10 @@ public class Result<T> implements Serializable {
         this.message = "操作成功!";
     }
 
+
+
+
+
     public boolean isFlag() {
         return flag;
     }

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/resources/mapper/acquisition/EartagDataDao.xml

@@ -31,4 +31,11 @@
         SELECT * FROM eartag_data ed1 JOIN (SELECT MAX(id) id FROM eartag_data ed2 ${ew.customSqlSegment}) b ON ed1.id = b.id
     </select>
 
+
+
+
+
+
+
+
 </mapper>