设备查询接口参数修改

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

@@ -52,7 +52,7 @@ public class DeviceController {
             @ApiParam(value = "设备编号/名称") @RequestParam(required = false)  String condition,
             @ApiParam(value = "所属公司") @RequestParam(required = false)  Integer companyOrgId,
             @ApiParam(value = "所属部门") @RequestParam(required = false)  Integer deptOrgId,
-            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Long sceneId,
+            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
             @ApiParam(value = "设备状态") @RequestParam(required = false) Integer enableState,
             @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
             @ApiParam(value = "条数，非必传，默认10条",  defaultValue = "10") @RequestParam(required = false, defaultValue = "10") Integer pageSize
@@ -61,7 +61,7 @@ public class DeviceController {
         deviceDto.setCondition(condition);
         deviceDto.setCompanyOrgId(companyOrgId);
         deviceDto.setDeptOrgId(deptOrgId);
-        deviceDto.setSceneId(sceneId.intValue());
+        deviceDto.setSceneId(sceneId);
         deviceDto.setEnableState(enableState);
 
         IPage<DeviceDto> iPage = new Page<>(pageNum, pageSize);
@@ -87,7 +87,7 @@ public class DeviceController {
             @ApiParam(value = "设备编号/名称") @RequestParam(required = false)  String condition,
             @ApiParam(value = "所属公司") @RequestParam(required = false)  Integer companyOrgId,
             @ApiParam(value = "所属部门") @RequestParam(required = false)  Integer deptOrgId,
-            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Long sceneId,
+            @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
             @ApiParam(value = "场景查询范围：1 不查询子级；0 查询子级",  defaultValue = "0") @RequestParam(required = false,defaultValue = "0")  Integer searchType,
             @ApiParam(value = "设备状态") @RequestParam(required = false) Integer enableState
     ){
@@ -95,7 +95,7 @@ public class DeviceController {
         deviceDto.setCondition(condition);
         deviceDto.setCompanyOrgId(companyOrgId);
         deviceDto.setDeptOrgId(deptOrgId);
-        deviceDto.setSceneId(sceneId.intValue());
+        deviceDto.setSceneId(sceneId);
         deviceDto.setEnableState(enableState);
         return new AjaxMessage<>(ResultStatus.OK, deviceService.selectList(deviceDto));
     }
@@ -105,21 +105,21 @@ public class DeviceController {
             @ApiParam(value = "设备编号/名称") @RequestParam(required = false)  String condition,
             @ApiParam(value = "所属公司") @RequestParam(required = false)  Integer companyOrgId,
             @ApiParam(value = "所属部门") @RequestParam(required = false)  Integer deptOrgId,
-            @ApiParam(value = "所属场景id",required = true) @RequestParam(required = true)  Long sceneId
+            @ApiParam(value = "所属场景id",required = true) @RequestParam(required = true)  Integer sceneId
     ){
         DeviceDto deviceDto = new DeviceDto();
         deviceDto.setCondition(condition);
         deviceDto.setCompanyOrgId(companyOrgId);
         deviceDto.setDeptOrgId(deptOrgId);
         deviceDto.setEnableState(1);
-        deviceDto.setSceneId(sceneId.intValue());
+        deviceDto.setSceneId(sceneId);
         List<DeviceDto> deviceDtos = new ArrayList<>();
         deviceDtos = deviceService.selectListByScene(deviceDto);
         //按场景ID,查询一级场景ID
-        SceneEntity sceneEntity = sceneService.findParentSceneById(sceneId);
+        SceneEntity sceneEntity = sceneService.findParentSceneById(sceneId.longValue());
         for(DeviceDto item: deviceDtos)
         {
-            item.setSceneId(sceneId.intValue());
+            item.setSceneId(sceneId);
             item.setParentSceneId(sceneEntity.getParentSceneId().intValue());
         }
         return new AjaxMessage<>(ResultStatus.OK, deviceDtos);