|
@@ -187,19 +187,27 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
|
|
DateUtil dateUtil = new DateUtil();
|
|
DateUtil dateUtil = new DateUtil();
|
|
QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("chip_id", chipId);
|
|
queryWrapper.eq("chip_id", chipId);
|
|
|
|
+ queryWrapper.orderByDesc("id");
|
|
|
|
+ queryWrapper.last("limit 1");
|
|
// 查询注册设备
|
|
// 查询注册设备
|
|
- BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectOne(queryWrapper);
|
|
|
|
- if (deviceRegister.getFirstTime() == null) {
|
|
|
|
- deviceRegister.setFirstTime(dateUtil.getTodayDatetime());
|
|
|
|
- }
|
|
|
|
- deviceRegister.setLastTime(dateUtil.getTodayDatetime());
|
|
|
|
- Integer times = deviceRegister.getAskTimes();
|
|
|
|
- if (times == null) {
|
|
|
|
- times = 0;
|
|
|
|
|
|
+// BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectOne(queryWrapper);
|
|
|
|
+ List<BizDeviceRegister> deviceRegisterList = bizDeviceRegisterMapper.selectList(queryWrapper);
|
|
|
|
+ if (deviceRegisterList.size() > 0) {
|
|
|
|
+ BizDeviceRegister deviceRegister = deviceRegisterList.get(0);
|
|
|
|
+ if (deviceRegister.getFirstTime() == null) {
|
|
|
|
+ deviceRegister.setFirstTime(dateUtil.getTodayDatetime());
|
|
|
|
+ }
|
|
|
|
+ deviceRegister.setLastTime(dateUtil.getTodayDatetime());
|
|
|
|
+ Integer times = deviceRegister.getAskTimes();
|
|
|
|
+ if (times == null) {
|
|
|
|
+ times = 0;
|
|
|
|
+ }
|
|
|
|
+ deviceRegister.setAskTimes(++times);
|
|
|
|
+ int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
|
|
|
|
+ return ResultUtil.result(rows);
|
|
|
|
+ } else {
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
- deviceRegister.setAskTimes(++times);
|
|
|
|
- int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
|
|
|
|
- return ResultUtil.result(rows);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -216,19 +224,26 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
|
|
DateUtil dateUtil = new DateUtil();
|
|
DateUtil dateUtil = new DateUtil();
|
|
QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("chip_id", chipId);
|
|
queryWrapper.eq("chip_id", chipId);
|
|
|
|
+ queryWrapper.orderByDesc("id");
|
|
|
|
+ queryWrapper.last("limit 1");
|
|
// 查询注册设备
|
|
// 查询注册设备
|
|
- BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectOne(queryWrapper);
|
|
|
|
- if (deviceRegister.getFirstTimeAnswer() == null) {
|
|
|
|
- deviceRegister.setFirstTimeAnswer(dateUtil.getTodayDatetime());
|
|
|
|
- }
|
|
|
|
- deviceRegister.setLastTimeAnswer(dateUtil.getTodayDatetime());
|
|
|
|
- Integer times = deviceRegister.getAnswerTimes();
|
|
|
|
- if (times == null) {
|
|
|
|
- times = 0;
|
|
|
|
|
|
+ List<BizDeviceRegister> deviceRegisterList = bizDeviceRegisterMapper.selectList(queryWrapper);
|
|
|
|
+ if (deviceRegisterList.size() > 0) {
|
|
|
|
+ BizDeviceRegister deviceRegister = deviceRegisterList.get(0);
|
|
|
|
+ if (deviceRegister.getFirstTimeAnswer() == null) {
|
|
|
|
+ deviceRegister.setFirstTimeAnswer(dateUtil.getTodayDatetime());
|
|
|
|
+ }
|
|
|
|
+ deviceRegister.setLastTimeAnswer(dateUtil.getTodayDatetime());
|
|
|
|
+ Integer times = deviceRegister.getAnswerTimes();
|
|
|
|
+ if (times == null) {
|
|
|
|
+ times = 0;
|
|
|
|
+ }
|
|
|
|
+ deviceRegister.setAnswerTimes(++times);
|
|
|
|
+ int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
|
|
|
|
+ return ResultUtil.result(rows);
|
|
|
|
+ } else {
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
- deviceRegister.setAnswerTimes(++times);
|
|
|
|
- int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
|
|
|
|
- return ResultUtil.result(rows);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|