2023-05-30 17:09:36 优化完善用户所属设备列表接口!

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<PsdcSceneRes> sceneRes = psdcSceneMapper.queryScenes(userId, sceneCode);
-//        List<SceneVo> 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<SceneVo> listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName);

psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java

@@ -46,6 +46,7 @@ public class TotalElectricMeterController {
         for (PsdcDevice dd : list){
             Map<String, Object> map = new HashMap<>();
             map.put("modelName", dd.getDeviceModel());
+            map.put("isControl", dd.getIsControl());
             List<Map> maps2 = new ArrayList<>();
             List<PsdcDevice> list2 = psdcDeviceService.queryByModel(dd.getDeviceModel());
             if (list2.size() > 0){