|
@@ -82,7 +82,8 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { |
|
@@ -82,7 +82,8 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { |
|
82
|
JsonObject dataObject = parserDeviceInfoDto.getData();
|
82
|
JsonObject dataObject = parserDeviceInfoDto.getData();
|
|
83
|
if(null != dataObject && dataObject.size() != 0)
|
83
|
if(null != dataObject && dataObject.size() != 0)
|
|
84
|
{
|
84
|
{
|
|
85
|
- String deviceInfoId =dataObject.get("sn").getAsJsonObject().get("value").getAsString()+"_1_1"; //25636548,//主机sn号 int 型
|
85
|
+ String sn = dataObject.get("sn").getAsJsonObject().get("value").getAsString();
|
|
|
|
86
|
+ String deviceInfoId =sn+"_1_1"; //25636548,//主机sn号 int 型
|
|
86
|
dataObject.remove("sn");
|
87
|
dataObject.remove("sn");
|
|
87
|
|
88
|
|
|
88
|
WdbTerminal wdbTerminal = (WdbTerminal) ly_baseDao.get(WdbTerminal.class,deviceInfoId);
|
89
|
WdbTerminal wdbTerminal = (WdbTerminal) ly_baseDao.get(WdbTerminal.class,deviceInfoId);
|
|
@@ -92,8 +93,8 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { |
|
@@ -92,8 +93,8 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { |
|
92
|
wdbTerminal = new WdbTerminal();
|
93
|
wdbTerminal = new WdbTerminal();
|
|
93
|
wdbTerminal.setId(deviceInfoId);
|
94
|
wdbTerminal.setId(deviceInfoId);
|
|
94
|
wdbTerminal.setCreateTime(parserDeviceInfoDto.getUpdateTime());
|
95
|
wdbTerminal.setCreateTime(parserDeviceInfoDto.getUpdateTime());
|
|
95
|
- wdbTerminal.setBaseStationId(deviceInfoId);
|
|
|
|
96
|
- wdbTerminal.setBaseStationName(deviceInfoId);
|
96
|
+ wdbTerminal.setBaseStationId(sn);
|
|
|
|
97
|
+ wdbTerminal.setBaseStationName(sn);
|
|
97
|
ly_baseDao.insert(wdbTerminal);
|
98
|
ly_baseDao.insert(wdbTerminal);
|
|
98
|
}
|
99
|
}
|
|
99
|
|
100
|
|
