From f8293f254a416213cfcc4e6faec1fc951e861844 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 15:46:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2023-06-02=2015:46:23=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=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=A1=A5=E5=85=85=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86=EF=BC=8C=E5=A2=9E=E5=BC=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=81=B5=E6=B4=BB=E6=80=A7!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/service/impl/PsdcSceneServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 3f731f4..153d9ce 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 @@ -197,6 +197,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { List ary = new ArrayList<>(); Integer deviceId = listByCode.get(0).getDeviceId(); DeviceVo deviceVo = new DeviceVo(); + Map map = new HashMap<>(); for (int i = 0; i < listByCode.size(); i++) { SceneVo sv = listByCode.get(i); if (deviceId == sv.getDeviceId()) { @@ -214,6 +215,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { deviceVo.setTemp(sv.getSceneValue()); break; } + map.put(sv.getSceneKey(), sv.getSceneValue()); + deviceVo.setTempValue(map); if (1 == listByCode.size() || i == listByCode.size() - 1){ ary.add(deviceVo); } @@ -222,6 +225,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { ary.add(deviceVo); deviceId = sv.getDeviceId(); deviceVo = new DeviceVo(); + map = new HashMap<>(); deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); @@ -234,6 +238,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { case "temp": deviceVo.setTemp(sv.getSceneValue()); } + map.put(sv.getSceneKey(), sv.getSceneValue()); + deviceVo.setTempValue(map); ary.add(deviceVo); } else { switch (sv.getSceneKey()) { @@ -247,6 +253,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { deviceVo.setTemp(sv.getSceneValue()); break; } + map.put(sv.getSceneKey(), sv.getSceneValue()); + deviceVo.setTempValue(map); } } } From c9afa413ec36fad5b006ed07ab5b014c3153e3b3 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 16:31:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023-06-02=2016:30:25=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E5=8F=AF?= =?UTF-8?q?=E6=8E=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/TotalElectricMeterController.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) 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 e396adf..7eef478 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 @@ -106,6 +106,56 @@ public class TotalElectricMeterController { return AjaxResult.success("用户所属设备列表", maps); } + @PreAuthorize("@ss.hasPermi('emonitor:db')") + @RequestMapping(value = "/selMyControldevices", method = RequestMethod.GET) + public AjaxResult selControlMydevices() { + List maps = new ArrayList<>(); + List list = psdcDeviceService.queryByUserId(0); + for (PsdcDevice dd : list){ + Map map = new HashMap<>(); + map.put("modelName", dd.getDeviceModel()); + if (2 == dd.getIsControl()){ + map.put("isControl", dd.getIsControl()); + List maps2 = new ArrayList<>(); + List list2 = psdcDeviceService.queryByModel(dd.getDeviceModel()); + if (list2.size() > 0){ + for (PsdcDevice dev : list2){ + Map map2 = new HashMap<>(); + map2.put("deviceId", dev.getDeviceId()); + map2.put("deviceName", dev.getDeviceName()); + List modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel()); + List ary = new ArrayList<>(); + for (ModelVo scr : modelVoList){ + Map content = new HashMap<>(); + content.put("label", scr.getIoDesc()); + content.put("value", scr.getRelationField()); + ary.add(content); + } + map2.put("controlKey", ary); + if (ary.size() > 0){ + maps2.add(map2); + } + } + } else { + PsdcDevice dev = psdcDeviceService.queryById(dd.getDeviceId()); + Map map2 = new HashMap<>(); + map2.put("deviceId", dev.getDeviceId()); + map2.put("deviceName", dev.getDeviceName()); + maps2.add(map2); + } + + if (maps2.size() > 0){ + map.put("children", maps2); + } + if (map.size() > 2){ + maps.add(map); + } + } + + } + return AjaxResult.success("用户所属设备列表", maps); + } + @PreAuthorize("@ss.hasPermi('emonitor:db')") @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET) public AjaxResult selzdb1(@PathVariable(value = "deviceId", required = false) Integer deviceId) {