【feat】查询打耳标流水

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/netty/EartagServerHandler2.java

@@ -109,11 +109,11 @@ private IEartagEartagRegisterService eartagRegisterService;
         String[] split = clientAskText.split("\\+");
 
 
-//        if ("6".equals(split[1])){
-//
-//            System.out.println("pliersDemo------------->" +clientAskText);
-//            ctx.writeAndFlush(Unpooled.copiedBuffer("hm+6+0+115.238.57.190+8013+8+end".getBytes()));
-//        }
+        if ("6".equals(split[1])){
+
+            System.out.println("pliersDemo------------->" +clientAskText);
+            ctx.writeAndFlush(Unpooled.copiedBuffer("hm+6+0+115.238.57.190+8013+8+end".getBytes()));
+        }
 
         if ("7".equals(split[1])){
 

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

@@ -39,12 +39,14 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataMapper, EartagD
         QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark",earmark);
         if (StringUtils.isBlank(startDate)){
-            wrapper.ge("ask_time", DateUtil.beginOfDay(now));
+//            wrapper.ge("ask_time", DateUtil.beginOfDay(now));
+            wrapper.ge("add_time", DateUtil.beginOfDay(now));
         }else {
-            wrapper.between("ask_time",startDate,endDate);
+//            wrapper.between("ask_time",startDate,endDate);
+            wrapper.between("add_time",startDate,endDate);
         }
 
-        wrapper.orderByAsc("ask_time");
+        wrapper.orderByAsc("add_time");
         List<EartagData> list = this.list(wrapper);
 
         return new Result(ResultCode.SUCCESS,list);

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

@@ -48,7 +48,8 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.like(StringUtils.isNotBlank(deviceCode),"belong_device",deviceCode);
         wrapper.eq("farm_id",farmId);
         wrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
-        wrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        wrapper.orderByDesc("ask_time");
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         for (EartagEartagRegister2 record : page.getRecords()) {
             Float earTemp1 = record.getEarTemp1();