综合调度

sms_water/src/main/java/com/huaxu/controller/DeviceController.java

@@ -98,7 +98,7 @@ public class DeviceController {
         deviceDto.setSceneId(sceneId);
         deviceDto.setEnableState(enableState);
         deviceDto.setSearchType(searchType);
-        return new AjaxMessage<>(ResultStatus.OK, deviceService.selectList(deviceDto));
+        return new AjaxMessage<>(ResultStatus.OK, deviceService.selectListByType(deviceDto));
     }
 
     @RequestMapping(value="selectListBySceneId" , method = RequestMethod.GET)

sms_water/src/main/java/com/huaxu/service/DeviceService.java

@@ -50,6 +50,8 @@ public interface DeviceService {
 
     List<DeviceDto> selectList(DeviceDto deviceDto);
 
+    List<DeviceDto> selectListByType(DeviceDto deviceDto);
+
     List<DeviceDto> selectListByScene(DeviceDto deviceDto);
     List<DeviceDto> selectListBySceneId(DeviceDto deviceDto);
 

sms_water/src/main/java/com/huaxu/service/impl/DeviceServiceImpl.java

@@ -93,6 +93,18 @@ public class DeviceServiceImpl implements DeviceService {
 
     @Override
     public List<DeviceDto> selectList(DeviceDto deviceDto) {
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        deviceDto.setTenantId(loginUser.getTenantId());
+        deviceDto.setProgramItems(loginUser.getProgramItemList());
+        deviceDto.setUserType(loginUser.getType());
+        //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+        deviceDto.setPermissonType(loginUser.getPermissonType());
+        List<DeviceDto> deviceDtos = deviceMapper.selectList(deviceDto);
+        return deviceDtos;
+    }
+
+    @Override
+    public List<DeviceDto> selectListByType(DeviceDto deviceDto) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         deviceDto.setTenantId(loginUser.getTenantId());
         deviceDto.setProgramItems(loginUser.getProgramItemList());