|
...
|
...
|
@@ -82,7 +82,7 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { |
|
|
|
JsonObject dataObject = parserDeviceInfoDto.getData();
|
|
|
|
if(null != dataObject && dataObject.size() != 0)
|
|
|
|
{
|
|
|
|
String deviceInfoId =dataObject.get("sn").getAsJsonObject().get("value").getAsString(); //25636548,//主机sn号 int 型
|
|
|
|
String deviceInfoId =dataObject.get("sn").getAsJsonObject().get("value").getAsString()+"_1_1"; //25636548,//主机sn号 int 型
|
|
|
|
dataObject.remove("sn");
|
|
|
|
|
|
|
|
WdbTerminal wdbTerminal = (WdbTerminal) ly_baseDao.get(WdbTerminal.class,deviceInfoId);
|
|
...
|
...
|
@@ -90,7 +90,7 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { |
|
|
|
if(null == wdbTerminal)
|
|
|
|
{
|
|
|
|
wdbTerminal = new WdbTerminal();
|
|
|
|
wdbTerminal.setId(deviceInfoId+"_1_1");
|
|
|
|
wdbTerminal.setId(deviceInfoId);
|
|
|
|
wdbTerminal.setCreateTime(parserDeviceInfoDto.getUpdateTime());
|
|
|
|
wdbTerminal.setBaseStationId(deviceInfoId);
|
|
|
|
wdbTerminal.setBaseStationName(deviceInfoId);
|
...
|
...
|
|