chuangte/autosprout
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-04-18 17:56:36 +08:00
parent d79ce1469b
commit 4d0051d5c2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.IotConstants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.AsUser;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.onenet.*;
import com.ruoyi.common.exception.ServiceException;
@ -25,7 +26,6 @@ import com.ruoyi.device.service.IAsUserService;
import com.ruoyi.device.service.IAsWateringRecordService;
import com.ruoyi.system.mapper.SysUserMapper;
import lombok.SneakyThrows;
import net.sourceforge.pinyin4j.PinyinHelper;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@ -243,9 +243,11 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
asDevice.setCreateTime(DateUtils.getNowDate());
AsDeviceClassify deviceClassify = classifyMapper.selectAsDeviceClassifyByClassifyId(asDevice.getClassifyId());
asDevice.setClassifyName(deviceClassify.getClassifyName());
SysUser sysUser = userMapper.selectUserById(asDevice.getUserId());
asDevice.setUserName(sysUser.getUserName());
asDevice.setNickName(sysUser.getNickName());
if(ObjectUtils.isNotEmpty(asDevice.getUserId())){
AsUser user = asUserService.selectUserById(asDevice.getUserId());
asDevice.setUserName(user.getUserName());
asDevice.setNickName(user.getNickName());
}
AsModel model = modelMapper.selectAsModelByModelId(asDevice.getModelId());
asDevice.setModel(model.getModel());
AsDeviceVersion asDeviceVersion = versionMapper.selectAsDeviceVersionByVersionId(asDevice.getVersionId());