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

2025-12-19 09:25:54 +08:00 · 2022-04-27 13:05:36 +08:00
parent 909bc54249
commit cabc91f3bc
12 changed files with 214 additions and 47 deletions
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
@@ -69,7 +69,7 @@ public class DeviceController extends BaseController
        {
            list = deviceService.selectDeviceShortList(device);
        }else {
-            //            精确查询
+            // 精确查询
            list = deviceService.selectDeviceShortListAccurate(device);
        }
        return getDataTable(list);
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceUserController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceUserController.java
@@ -1,9 +1,7 @@
 package com.ruoyi.iot.controller;

 import java.util.List;
-import javax.servlet.http.HttpServletResponse;

-import com.ruoyi.iot.domain.Firmware;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,7 +20,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.iot.domain.DeviceUser;
 import com.ruoyi.iot.service.IDeviceUserService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

 /**
@@ -53,7 +50,7 @@ public class DeviceUserController extends BaseController
    }

    /**
-     * 获取设备用户详细信息
+     * 获取设备用户详细信息 根据deviceId 查询的话可能会查出多个
     */
    @PreAuthorize("@ss.hasPermi('iot:device:query')")
    @GetMapping(value = "/{deviceId}")
@@ -63,6 +60,17 @@ public class DeviceUserController extends BaseController
        return AjaxResult.success(deviceUserService.selectDeviceUserByDeviceId(deviceId));
    }

+    /**
+     * 获取设备用户详细信息 双主键 device_id 和 user_id
+     */
+    @PreAuthorize("@ss.hasPermi('iot:device:query')")
+    @GetMapping(value = "/{deviceId}/{userId}")
+    @ApiOperation("获取设备用户详情,根据用户id 和 设备id")
+    public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId, @PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(deviceUserService.selectDeviceUserByDeviceIdAndUserId(deviceId, userId));
+    }
+
    /**
     * 新增设备用户
     */
@@ -75,6 +83,18 @@ public class DeviceUserController extends BaseController
        return toAjax(deviceUserService.insertDeviceUser(deviceUser));
    }

+    /**
+     * 新增多个设备用户
+     */
+    @PreAuthorize("@ss.hasPermi('iot:device:add')")
+    @Log(title = "设备用户", businessType = BusinessType.INSERT)
+    @PostMapping("/addDeviceUsers")
+    @ApiOperation("添加设备用户")
+    public AjaxResult addDeviceUsers(@RequestBody List<DeviceUser> deviceUsers)
+    {
+        return toAjax(deviceUserService.insertDeviceUserList(deviceUsers));
+    }
+
    /**
     * 修改设备用户
     */
@@ -91,13 +111,13 @@ public class DeviceUserController extends BaseController
    /**
     * 删除设备用户
     */
-    @ApiOperation("批量删除设备用户")
+    @ApiOperation("删除设备用户")
    @PreAuthorize("@ss.hasPermi('iot:device:remove')")
    @Log(title = "设备用户", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{deviceIds}")
-    public AjaxResult remove(@PathVariable Long[] deviceIds)
+	@DeleteMapping
+    public AjaxResult remove(@RequestBody DeviceUser deviceUser)
    {
-        int count=deviceUserService.deleteDeviceUserByDeviceIds(deviceIds);
+        int count=deviceUserService.deleteDeviceUser(deviceUser);
        if(count==0){
            return AjaxResult.error("设备所有者不能删除");
        }else{
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceUserMapper.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceUserMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.iot.mapper;

 import java.util.List;
 import com.ruoyi.iot.domain.DeviceUser;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

 /**
@@ -19,7 +20,7 @@ public interface DeviceUserMapper
     * @param deviceId 设备用户主键
     * @return 设备用户
     */
-    public DeviceUser selectDeviceUserByDeviceId(Long deviceId);
+    public List<DeviceUser> selectDeviceUserByDeviceId(Long deviceId);

    /**
     * 查询设备用户列表
@@ -60,4 +61,21 @@ public interface DeviceUserMapper
     * @return 结果
     */
    public int deleteDeviceUserByDeviceIds(Long[] deviceIds);
+
+    /**
+     * 批量添加设备用户
+     * @param deviceUsers 设备用户
+     * @return 结果
+     */
+    public int insertDeviceUserList(List<DeviceUser> deviceUsers);
+
+    /**
+     * 根据deviceId 和 userId 查询
+     * @param deviceId 设备id
+     * @param userId   用户id
+     * @return         结果
+     */
+    public DeviceUser selectDeviceUserByDeviceIdAndUserId(@Param("deviceId") Long deviceId, @Param("userId") Long userId);
+
+    public int deleteDeviceUser(DeviceUser deviceUser);
 }
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceUserService.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceUserService.java
@@ -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);
 }
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -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);
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceUserServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceUserServiceImpl.java
@@ -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);
+    }
 }