From 8a4871875555be7e0e985eedb3e9b6b8ba35ec55 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Tue, 30 May 2023 16:09:48 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-30=2016:09:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8A=9F=E8=83=BD!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/psdc/mapper/PsdcSceneMapper.java | 5 +++-- .../com/psdc/service/impl/PsdcSceneServiceImpl.java | 13 ++++++------- .../resources/mapper/business/PsdcSceneMapper.xml | 11 ++++++++++- .../controller/manager/PsdcDeviceController.java | 2 +- .../controller/manager/PsdcSceneController.java | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java index 63f2e6f..ccc48eb 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java @@ -1,6 +1,7 @@ package com.psdc.mapper; import com.psdc.entity.PsdcScene; +import com.psdc.entity.res.PsdcSceneRes; import com.psdc.entity.vo.SceneVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -113,6 +114,6 @@ public interface PsdcSceneMapper{ @Param(value = "sceneCode") Long sceneCode, @Param(value = "sceneName") String sceneName); - List queryScenes(@Param(value = "userId") Long userId, - @Param(value = "sceneCode") Long sceneCode); + List queryScenes(@Param(value = "userId") Long userId, + @Param(value = "sceneCode") Long sceneCode); } \ No newline at end of file diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index cdb5984..06e6aaf 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -190,12 +190,12 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { public List findSceneByUserAndSceneName(Long sceneCode) { Long userId = SecurityUtils.getUserId(); String sceneName = ""; - List sceneRes = new ArrayList<>(); - List sceneVos = psdcSceneMapper.queryScenes(userId, sceneCode); - for (SceneVo sv : sceneVos) { - PsdcSceneRes res = new PsdcSceneRes(sv.getSceneId(), sv.getSceneName(), sv.getSceneCode(), sv.getUserId(), sv.getCreateTime(), sv.getSceneRemark()); - sceneRes.add(res); - } + List sceneRes = psdcSceneMapper.queryScenes(userId, sceneCode); +// List sceneVos = psdcSceneMapper.queryScenes(userId, sceneCode); +// for (SceneVo sv : sceneVos) { +// PsdcSceneRes res = new PsdcSceneRes(sv.getSceneId(), sv.getSceneName(), sv.getSceneCode(), sv.getUserId(), sv.getCreateTime(), sv.getSceneRemark()); +// sceneRes.add(res); +// } for (PsdcSceneRes psr : sceneRes) { Long code = psr.getSceneCode(); List listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName); @@ -256,7 +256,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } psr.setDeviceVos(ary); } - return sceneRes; } diff --git a/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml index 30b87ed..1363ea6 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml @@ -31,6 +31,15 @@ + + + + + + + + + - Select ps.scene_id,ps.scene_name,ps.scene_code,ps.user_id,pd.device_name,ps.device_id,pd.device_sn,ps.scene_context,ps.scene_key,ps.scene_value, ps.scene_remark,ps.create_by,ps.create_time,ps.update_by,ps.update_time From psdc_scene ps diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java index 24dd656..1a1e2b5 100644 --- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java +++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java @@ -109,7 +109,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(); + // startPage(); PsdcDevice deviceVo = myPage(jsonObject, PsdcDevice.class); List list = psdcDeviceService.queryAllByLimit(deviceVo); return getDataTable(list); diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java index d24b897..2305165 100644 --- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java +++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java @@ -56,7 +56,7 @@ public class PsdcSceneController extends BaseController { @PreAuthorize("@ss.hasPermi('system:cl:list')") @RequestMapping(value = "/list", method = RequestMethod.POST) public TableDataInfo list(@RequestBody JSONObject jsonObject) { - startPage(); + // startPage(); PsdcSceneRequest sceneVo = myPage(jsonObject, PsdcSceneRequest.class); List list = psdcSceneService.findSceneByUserAndSceneName(sceneVo.getSceneCode()); return getDataTable(list);