code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-19 09:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

分享单个或全部设备功能实现，用户设备列表接口调整，新增别人分享给自己的设备

Browse Source
This commit is contained in:
hp
2022-04-27 13:05:36 +08:00
parent 909bc54249
commit cabc91f3bc
12 changed files with 214 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceUserService.java
View File

@@ -17,7 +17,7 @@ public interface IDeviceUserService
* @param deviceId 设备用户主键
* @return 设备用户
*/
public DeviceUser selectDeviceUserByDeviceId(Long deviceId);
public List<DeviceUser> selectDeviceUserByDeviceId(Long deviceId);
/**
* 查询设备用户列表
@@ -58,4 +58,21 @@ public interface IDeviceUserService
* @return 结果
*/
public int deleteDeviceUserByDeviceId(Long deviceId);
/**
* 批量添加设备用户
* @param deviceUsers 设备用户
* @return 结果
*/
public int insertDeviceUserList(List<DeviceUser> deviceUsers);
/**
* 查询设备用户
*
* @param deviceId 设备用户主键
* @return 设备用户
*/
public DeviceUser selectDeviceUserByDeviceIdAndUserId(Long deviceId, Long userId);
public int deleteDeviceUser(DeviceUser deviceUser);
}

4
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
View File

@@ -250,7 +250,7 @@ public class DeviceServiceImpl implements IDeviceService {
return deviceList;
}
// 精准查询所有条件的设备
// 精准查询所有条件的设备
@Override
public List<DeviceShortOutput> selectDeviceShortListAccurate(Device device) {
return deviceMapper.selectDeviceShortListAccurate(device);
@@ -544,7 +544,7 @@ public class DeviceServiceImpl implements IDeviceService {
public List<DeviceAllShortOutput> selectAllDeviceShortListAccurate(String userName) {
return deviceMapper.selectAllDeviceShortListAccurate(userName);
}
// 精准查询
// 精准查询 新增别人分享给自己的设备
@Override
public List<Device> selectDeviceListAccurate(Device device) {
return deviceMapper.selectDeviceListAccurate(device);

32
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceUserServiceImpl.java
View File

@@ -6,8 +6,10 @@ import com.ruoyi.iot.domain.DeviceUser;
import com.ruoyi.iot.mapper.DeviceUserMapper;
import com.ruoyi.iot.service.IDeviceUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import java.sql.SQLIntegrityConstraintViolationException;
import java.util.List;
import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
@@ -31,7 +33,7 @@ public class DeviceUserServiceImpl implements IDeviceUserService
* @return 设备用户
*/
@Override
public DeviceUser selectDeviceUserByDeviceId(Long deviceId)
public List<DeviceUser> selectDeviceUserByDeviceId(Long deviceId)
{
return deviceUserMapper.selectDeviceUserByDeviceId(deviceId);
}
@@ -57,6 +59,8 @@ public class DeviceUserServiceImpl implements IDeviceUserService
@Override
public int insertDeviceUser(DeviceUser deviceUser)
{
List<DeviceUser> deviceUsers = selectDeviceUserList(deviceUser);
if (!deviceUsers.isEmpty()) throw new RuntimeException("该用户已添加, 禁止重复添加");
deviceUser.setCreateTime(DateUtils.getNowDate());
deviceUser.setIsOwner(0);
SysUser sysUser = getLoginUser().getUser();
@@ -101,4 +105,30 @@ public class DeviceUserServiceImpl implements IDeviceUserService
{
return deviceUserMapper.deleteDeviceUserByDeviceId(deviceId);
}
@Override
public int insertDeviceUserList(List<DeviceUser> deviceUsers) {
try {
deviceUsers.forEach(deviceUser -> {
deviceUser.setCreateTime(DateUtils.getNowDate());
deviceUser.setIsOwner(0);
SysUser sysUser = getLoginUser().getUser();
deviceUser.setTenantId(sysUser.getUserId());
deviceUser.setTenantName(sysUser.getUserName());
});
return deviceUserMapper.insertDeviceUserList(deviceUsers);
} catch (DuplicateKeyException e) {
throw new RuntimeException("存在设备已经与用户绑定");
}
}
@Override
public DeviceUser selectDeviceUserByDeviceIdAndUserId(Long deviceId, Long userId) {
return deviceUserMapper.selectDeviceUserByDeviceIdAndUserId(deviceId, userId);
}
@Override
public int deleteDeviceUser(DeviceUser deviceUser) {
return deviceUserMapper.deleteDeviceUser(deviceUser);
}
}