历史记录

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java

@@ -193,6 +193,7 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
                     if (deviceInfoJson.getString("deviceCode").equals(hwDevice.getDeviceCode())) {
                         deviceInfoJson.put("userName", modeAccount);
                         deviceInfoJson.put("password", modeKey);
+//                        deviceInfoJsonArr.add(deviceInfoJson);
                         redisUpdated = true;
                     }
                 }
@@ -838,7 +839,9 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
     @Override
     public JSONObject getOnlineDevicesCount(Long sceneId) {
         JSONObject returnObj = new JSONObject();
-        int onlineDevicesCount = hwDeviceMapper.getOnlineDeviceNum(sceneId);
+        Long tenantId = SecurityUtils.getTenantId();
+        HwScene hwScene = hwSceneMapper.selectHwSceneByTenantId(tenantId);
+        int onlineDevicesCount = hwDeviceMapper.getOnlineDeviceNum(hwScene.getSceneId());
 
         JSONObject sortedJsonObject = new JSONObject();
 
@@ -1440,8 +1443,13 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
             List<String> list2 = new ArrayList<String>();
             list2.addAll(strings);
             for (int i = 0; i < list2.size(); i++) {
+                String s = "";
+                if (list2.get(i).equals("value1")){
+                    s = hwDeviceMapper.selectFunctionNameByFunctionIdentifier("value",modeId);
+                }else {
+                    s = hwDeviceMapper.selectFunctionNameByFunctionIdentifier(list2.get(i),modeId);
+                }
                 //查询类型的字段名
-                String s = hwDeviceMapper.selectFunctionNameByFunctionIdentifier(list2.get(i),modeId);
                 mapName.put(list2.get(i),s);
             }
             list.add(mapName);