【feat】查询打耳标流水

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

@@ -121,17 +121,31 @@ private IEartagEartagRegisterService eartagRegisterService;
             //hm+7+868977051335099+122083123610011+22450+184902913+0+end
             String eartag = split[3];
             String device = split[2];
-            EartagDeviceRegister deviceRegister = deviceRegisterService.getOne(new QueryWrapper<EartagDeviceRegister>().eq("device_code", device));
+            EartagDeviceRegister deviceRegister = deviceRegisterService.getOne(new QueryWrapper<EartagDeviceRegister>().eq("chip_id", device));
             if(ObjectUtil.isNotEmpty(deviceRegister)){
-                EartagEartagRegister eartagEartagRegister = new EartagEartagRegister();
-                eartagEartagRegister.setEarmark(eartag);
-                eartagEartagRegister.setFirstDevice(device);
-                eartagEartagRegister.setRegisterTime(new Date());
-                eartagEartagRegister.setRegisterType(2);
-                eartagEartagRegister.setFarmId(deviceRegister.getFarmId());
-                eartagEartagRegister.setCreateDate(new Date());
-
-                eartagRegisterService.save(eartagEartagRegister);
+
+                EartagEartagRegister eartagRegister = eartagRegisterService.getOne(new QueryWrapper<EartagEartagRegister>().eq("earmark", eartag));
+                if (ObjectUtil.isNotEmpty(eartagRegister)){
+                    eartagRegister.setEarmark(eartag);
+                    eartagRegister.setFirstDevice(device);
+                    eartagRegister.setRegisterTime(new Date());
+                    eartagRegister.setRegisterType(2);
+                    eartagRegister.setFarmId(deviceRegister.getFarmId());
+                    eartagRegister.setCreateDate(new Date());
+
+                    eartagRegisterService.updateById(eartagRegister);
+                }else {
+                    EartagEartagRegister eartagEartagRegister = new EartagEartagRegister();
+                    eartagEartagRegister.setEarmark(eartag);
+                    eartagEartagRegister.setFirstDevice(device);
+                    eartagEartagRegister.setRegisterTime(new Date());
+                    eartagEartagRegister.setRegisterType(2);
+                    eartagEartagRegister.setFarmId(deviceRegister.getFarmId());
+                    eartagEartagRegister.setCreateDate(new Date());
+
+                    eartagRegisterService.save(eartagEartagRegister);
+                }
+
                 //耳标记录，加上webSoket
                 //hm+7+868977051335099+122083123610011+22450+184902913+0+end
                 String lac = split[4];
@@ -212,16 +226,11 @@ private IEartagEartagRegisterService eartagRegisterService;
                 WebSocket.sendMessage("true");
 
 
-
-
-                ctx.writeAndFlush(Unpooled.copiedBuffer("hm+7+8+end".getBytes()));
             }
 
-
-
-
-
         }
+        ctx.writeAndFlush(Unpooled.copiedBuffer("hm+7+8+end".getBytes()));
+
 
     }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/PliersDemo.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -34,6 +35,7 @@ public class PliersDemo implements Serializable {
 
     private String pliersId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     private Integer usegeTimes;