2023-05-16 14:08:35 完成策略管理的增、删、改、查接口!

psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java

@@ -96,6 +96,7 @@ public class PsdcDeviceController extends BaseController {
     public TableDataInfo controlLogList(@RequestBody JSONObject jsonObject) {
     //  PageMethod.startPage(jsonObject.getInteger("pageNum"),jsonObject.getInteger("pageSize"));
     //  PsdcDevice deviceVo = JSON.parseObject(String.valueOf(jsonObject), PsdcDevice.class);
+        startPage();
         PsdcDevice deviceVo = myPage(jsonObject, PsdcDevice.class);
         List<PsdcDeviceInfoRes> list = psdcDeviceService.queryAllByLimit(deviceVo);
         return getDataTable(list);

psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java

@@ -1,9 +1,11 @@
 package com.psdc.controller.manager;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.psdc.annotation.Log;
 import com.psdc.core.controller.BaseController;
 import com.psdc.core.domain.AjaxResult;
 import com.psdc.core.page.TableDataInfo;
+import com.psdc.entity.PsdcDevice;
 import com.psdc.entity.PsdcScene;
 import com.psdc.entity.vo.SceneVo;
 import com.psdc.enums.BusinessType;
@@ -48,10 +50,11 @@ public class PsdcSceneController extends BaseController {
     }
 
     @PreAuthorize("@ss.hasPermi('system:cl:list')")
-    @RequestMapping(value = "/list/{sceneId}", method = RequestMethod.GET)
-    public TableDataInfo list(@PathVariable(value = "sceneId", required = false) Integer sceneId) {
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public TableDataInfo list(@RequestBody JSONObject jsonObject) {
         startPage();
-        List<SceneVo> list = psdcSceneService.findSceneByUserAndSceneName(sceneId);
+        PsdcScene sceneVo = myPage(jsonObject, PsdcScene.class);
+        List<SceneVo> list = psdcSceneService.findSceneByUserAndSceneName(sceneVo.getSceneId());
         return getDataTable(list);
     }