|
|
@@ -6,14 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.huimv.eartag2.manage2.config.WebSocket;
|
|
|
-import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
|
|
|
-import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
|
|
|
-import com.huimv.eartag2.manage2.pojo.PliersDemo;
|
|
|
-import com.huimv.eartag2.manage2.pojo.StationLib;
|
|
|
-import com.huimv.eartag2.manage2.service.IEartagDeviceRegisterService;
|
|
|
-import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
|
|
|
-import com.huimv.eartag2.manage2.service.IPliersDemoService;
|
|
|
-import com.huimv.eartag2.manage2.service.IStationLibService;
|
|
|
+import com.huimv.eartag2.manage2.pojo.*;
|
|
|
+import com.huimv.eartag2.manage2.service.*;
|
|
|
import io.netty.buffer.ByteBuf;
|
|
|
import io.netty.buffer.Unpooled;
|
|
|
import io.netty.channel.ChannelHandler;
|
|
|
@@ -44,7 +38,7 @@ import java.util.List;
|
|
|
public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
|
|
|
private StringBuilder askTextSb = null;
|
|
|
@Autowired
|
|
|
-private IEartagEartagRegisterService eartagRegisterService;
|
|
|
+private IEartagEartagRegister2Service eartagRegisterService;
|
|
|
@Autowired
|
|
|
private IEartagDeviceRegisterService deviceRegisterService;
|
|
|
|
|
|
@@ -124,7 +118,7 @@ private IEartagEartagRegisterService eartagRegisterService;
|
|
|
EartagDeviceRegister deviceRegister = deviceRegisterService.getOne(new QueryWrapper<EartagDeviceRegister>().eq("chip_id", device));
|
|
|
if(ObjectUtil.isNotEmpty(deviceRegister)){
|
|
|
|
|
|
- EartagEartagRegister eartagRegister = eartagRegisterService.getOne(new QueryWrapper<EartagEartagRegister>().eq("earmark", eartag));
|
|
|
+ EartagEartagRegister2 eartagRegister = eartagRegisterService.getOne(new QueryWrapper<EartagEartagRegister2>().eq("earmark", eartag));
|
|
|
if (ObjectUtil.isNotEmpty(eartagRegister)){
|
|
|
eartagRegister.setEarmark(eartag);
|
|
|
eartagRegister.setFirstDevice(device);
|
|
|
@@ -135,7 +129,7 @@ private IEartagEartagRegisterService eartagRegisterService;
|
|
|
|
|
|
eartagRegisterService.updateById(eartagRegister);
|
|
|
}else {
|
|
|
- EartagEartagRegister eartagEartagRegister = new EartagEartagRegister();
|
|
|
+ EartagEartagRegister2 eartagEartagRegister = new EartagEartagRegister2();
|
|
|
eartagEartagRegister.setEarmark(eartag);
|
|
|
eartagEartagRegister.setFirstDevice(device);
|
|
|
eartagEartagRegister.setRegisterTime(new Date());
|
