|
@@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit;
|
|
|
*/
|
|
*/
|
|
|
@Service
|
|
@Service
|
|
|
public class LabSensorServiceImpl implements ILabSensorService {
|
|
public class LabSensorServiceImpl implements ILabSensorService {
|
|
|
- private static Logger logger = LoggerFactory.getLogger(LabSensorServiceImpl.class);
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private LabSensorMapper labSensorMapper;
|
|
private LabSensorMapper labSensorMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -140,7 +139,6 @@ public class LabSensorServiceImpl implements ILabSensorService {
|
|
|
Object subjectStr=redisService.getCacheObject(getKey(GatewayNum));
|
|
Object subjectStr=redisService.getCacheObject(getKey(GatewayNum));
|
|
|
Long subId=null;
|
|
Long subId=null;
|
|
|
if(null!=subjectStr && !"".equals(subjectStr) ){
|
|
if(null!=subjectStr && !"".equals(subjectStr) ){
|
|
|
- //logger.error("num:"+GatewayNum+"subjectStr:"+subjectStr);
|
|
|
|
|
subId=Long.parseLong(subjectStr.toString());
|
|
subId=Long.parseLong(subjectStr.toString());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -166,7 +164,6 @@ public class LabSensorServiceImpl implements ILabSensorService {
|
|
|
subId=aLong;
|
|
subId=aLong;
|
|
|
redisService.setCacheObject(getKey(GatewayNum),aLong,5L, TimeUnit.MINUTES);
|
|
redisService.setCacheObject(getKey(GatewayNum),aLong,5L, TimeUnit.MINUTES);
|
|
|
}
|
|
}
|
|
|
- //logger.error("num:"+GatewayNum+"subId:"+subId);
|
|
|
|
|
return subId;
|
|
return subId;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -182,13 +179,10 @@ public class LabSensorServiceImpl implements ILabSensorService {
|
|
|
labSensor.setUpdateTime(DateUtils.getNowDate());
|
|
labSensor.setUpdateTime(DateUtils.getNowDate());
|
|
|
LabSensor old = labSensorMapper.selectLabSensorById(labSensor.getId());
|
|
LabSensor old = labSensorMapper.selectLabSensorById(labSensor.getId());
|
|
|
int i = labSensorMapper.updateLabSensor(labSensor);
|
|
int i = labSensorMapper.updateLabSensor(labSensor);
|
|
|
- if(i==1)
|
|
|
|
|
|
|
+ if(i==1 && old.getGatewayId()!=null)
|
|
|
//需要删除旧的key
|
|
//需要删除旧的key
|
|
|
{
|
|
{
|
|
|
- if(old.getGatewayId()!=null)
|
|
|
|
|
- {
|
|
|
|
|
- redisService.deleteObject(getKey(old.getGatewayId()));
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ redisService.deleteObject(getKey(old.getGatewayId()));
|
|
|
}
|
|
}
|
|
|
return i;
|
|
return i;
|
|
|
}
|
|
}
|