|
@@ -10,6 +10,7 @@ import com.fdkankan.ucenter.vo.request.AppSceneParam;
|
|
|
import com.fdkankan.ucenter.vo.request.DeviceListParam;
|
|
|
import com.fdkankan.ucenter.vo.request.SceneParam;
|
|
|
import lombok.extern.log4j.Log4j2;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -37,6 +38,9 @@ public class DeviceSceneController extends BaseController {
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.POST)
|
|
|
public Result getScenes(@RequestBody SceneParam param) throws Exception {
|
|
|
param.setHasFolder(0);
|
|
|
+ if(StringUtils.isNotBlank(param.getSearchKey())){
|
|
|
+ param.setSceneName(param.getSearchKey());
|
|
|
+ }
|
|
|
JSONObject data = sceneProService.newList(param, null);
|
|
|
JSONObject pageInfo = data.getJSONObject("pageInfo");
|
|
|
pageInfo.put("sceneNum",pageInfo.getInteger("total"));
|