zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据mac获取门店

Browse Source
This commit is contained in:
zengtao01
2024-09-29 22:44:55 +08:00
parent cc46939e86
commit 5b24efb3ef
6 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/deviceInfo/DeviceInfoApiImpl.java
View File

@ -1,10 +1,14 @@
package cn.iocoder.yudao.module.system.api.deviceInfo;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.system.api.deviceInfo.dto.DeviceInfoDto;
import cn.iocoder.yudao.module.system.dal.dataobject.deviceInfo.DeviceInfoDO;
import cn.iocoder.yudao.module.system.dal.dataobject.facedeviceinfo.FaceDeviceInfoDO;
import cn.iocoder.yudao.module.system.dal.mysql.deviceInfo.DeviceInfoMapper;
import cn.iocoder.yudao.module.system.dal.mysql.facedeviceinfo.FaceDeviceInfoMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -18,6 +22,10 @@ import java.util.List;
public class DeviceInfoApiImpl implements DeviceInfoApi {
@Resource
private DeviceInfoMapper deviceInfoMapper;
@Resource
private FaceDeviceInfoMapper faceDeviceInfoMapper;
@Override
public List<DeviceInfoDto> getDeviceInfoList(Long carteenId) {
return BeanUtils.toBean(deviceInfoMapper.selectList(new LambdaQueryWrapperX<DeviceInfoDO>()
@ -52,4 +60,21 @@ public class DeviceInfoApiImpl implements DeviceInfoApi {
List<DeviceInfoDO> deviceInfoDOS = deviceInfoMapper.selectList();
return BeanUtils.toBean(deviceInfoDOS,DeviceInfoDto.class);
}
@Override
public Long getCarteen(String mac) {
DeviceInfoDO deviceInfoDO = deviceInfoMapper.selectOne(new LambdaQueryWrapper<DeviceInfoDO>()
.eq(DeviceInfoDO::getDeviceIp, mac)
.last("limit 1"));
if(ObjectUtil.isNotEmpty(deviceInfoDO)){
return deviceInfoDO.getCarteenId();
}
FaceDeviceInfoDO faceDeviceInfoDO = faceDeviceInfoMapper.selectOne(new LambdaQueryWrapper<FaceDeviceInfoDO>()
.eq(FaceDeviceInfoDO::getMac, mac)
.last("limit 1"));
if(ObjectUtil.isNotEmpty(faceDeviceInfoDO)){
return faceDeviceInfoDO.getCarteenId();
}
return null;
}
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java
View File

@ -110,6 +110,9 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
List<DeviceInfoDO> deviceInfoDOS = deviceInfoMapper.selectList();
List<String> devuceList = deviceInfoDOS.stream().map(DeviceInfoDO::getDeviceIp).collect(Collectors.toList());
for (String deviceSn : devuceList){
if(StringUtils.isBlank(deviceSn)){
continue;
}
String time = RedisTemplate.opsForValue().get(deviceSn);
if(StringUtils.isBlank(time)){
updateList.add(deviceSn);

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.devuce;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@ -21,6 +22,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.dishes.DishesMapper;
import cn.iocoder.yudao.module.system.dal.mysql.dishesnutrition.DishesNutritionMapper;
import cn.iocoder.yudao.module.system.dal.mysql.dishestype.DishesTypeMapper;
import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springframework.stereotype.Service;
@ -168,7 +170,14 @@ public class DevuceServiceImpl implements DevuceService {
// .eq(DishesDO::getCarteenId,carteenId)
// .eq(DishesDO::getDishecType,dishecType));
// }else{
return dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
String mac = this.getHearder();
DeviceInfoDO deviceInfoDO = deviceInfoMapper.selectOne(new LambdaQueryWrapper<DeviceInfoDO>()
.eq(DeviceInfoDO::getDeviceIp, mac)
.last("limit 1"));
if(ObjectUtil.isNotEmpty(deviceInfoDO)){
carteenId = deviceInfoDO.getCarteenId();
}
return dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
.eq(DishesDO::getCarteenId,carteenId)
.eq(DishesDO::getDishecType,dishecType));
// }