From 0e6ab722458305467648475c43e33582dace08fa Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Tue, 30 May 2023 17:10:21 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-30=2017:09:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/service/impl/PsdcSceneServiceImpl.java | 5 ----- .../controller/monitor/TotalElectricMeterController.java | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) 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 06e6aaf..b1ca67a 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 @@ -191,11 +191,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { Long userId = SecurityUtils.getUserId(); String sceneName = ""; 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); diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java index 4a0d0aa..5305e96 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java @@ -46,6 +46,7 @@ public class TotalElectricMeterController { for (PsdcDevice dd : list){ Map map = new HashMap<>(); map.put("modelName", dd.getDeviceModel()); + map.put("isControl", dd.getIsControl()); List maps2 = new ArrayList<>(); List list2 = psdcDeviceService.queryByModel(dd.getDeviceModel()); if (list2.size() > 0){