钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 29c54538ad20b440f53e77c3d56b71eb4836f43c 1 个父辈 385a441b

修改温度宝bug

内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 2 行删除
@@ -82,7 +82,7 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { @@ -82,7 +82,7 @@ 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(); //25636548,//主机sn号 int 型 85 + String deviceInfoId =dataObject.get("sn").getAsJsonObject().get("value").getAsString()+"_1_1"; //25636548,//主机sn号 int 型
86 dataObject.remove("sn"); 86 dataObject.remove("sn");
87 87
88 WdbTerminal wdbTerminal = (WdbTerminal) ly_baseDao.get(WdbTerminal.class,deviceInfoId); 88 WdbTerminal wdbTerminal = (WdbTerminal) ly_baseDao.get(WdbTerminal.class,deviceInfoId);
@@ -90,7 +90,7 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory { @@ -90,7 +90,7 @@ public class WenDuBaoProtocolSyncFactoryImpl implements ProtocolSyncFactory {
90 if(null == wdbTerminal) 90 if(null == wdbTerminal)
91 { 91 {
92 wdbTerminal = new WdbTerminal(); 92 wdbTerminal = new WdbTerminal();
93 - wdbTerminal.setId(deviceInfoId+"_1_1"); 93 + wdbTerminal.setId(deviceInfoId);
94 wdbTerminal.setCreateTime(parserDeviceInfoDto.getUpdateTime()); 94 wdbTerminal.setCreateTime(parserDeviceInfoDto.getUpdateTime());
95 wdbTerminal.setBaseStationId(deviceInfoId); 95 wdbTerminal.setBaseStationId(deviceInfoId);
96 wdbTerminal.setBaseStationName(deviceInfoId); 96 wdbTerminal.setBaseStationName(deviceInfoId);