|
@@ -44,9 +44,11 @@ public class DeviceSceneController extends BaseController {
|
|
if(StringUtils.isNotBlank(param.getSearchKey())){
|
|
if(StringUtils.isNotBlank(param.getSearchKey())){
|
|
param.setSceneName(param.getSearchKey());
|
|
param.setSceneName(param.getSearchKey());
|
|
}
|
|
}
|
|
- if(param.getCameraId() == null){
|
|
|
|
|
|
+ String username = JwtUtil.getUsername(getToken());
|
|
|
|
+ if(StringUtils.isBlank(username)){
|
|
throw new BusinessException(ResultCode.PARAM_MISS);
|
|
throw new BusinessException(ResultCode.PARAM_MISS);
|
|
}
|
|
}
|
|
|
|
+ param.setSnCode(username);
|
|
JSONObject data = sceneProService.newList(param, null);
|
|
JSONObject data = sceneProService.newList(param, null);
|
|
JSONObject pageInfo = data.getJSONObject("pageInfo");
|
|
JSONObject pageInfo = data.getJSONObject("pageInfo");
|
|
pageInfo.put("sceneNum",pageInfo.getInteger("total"));
|
|
pageInfo.put("sceneNum",pageInfo.getInteger("total"));
|