wangmengzhao
2023-12-13 d8228730095cdcaccb40dd2dc290fc44779e340a
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -184,6 +184,11 @@
        return deviceMapper.selectUserDeviceByCount(id);
    }
    @Override
    public List<Device> selectDeviceAll() throws Exception {
        return deviceMapper.selectDeviceAll();
    }
    /**
     * 根据设备编号查询简介设备
     *
@@ -239,6 +244,7 @@
        // 查询物模型
        String thingsModels = thingsModelService.getCacheThingsModelByProductId(input.getProductId());
        JSONObject thingsModelObject = JSONObject.parseObject(thingsModels);
        //ThingsModelValueItemDto——物模型
        List<ThingsModelValueItemDto> valueList = null;
        if (type == 1) {
            JSONArray properties = thingsModelObject.getJSONArray("properties");
@@ -250,6 +256,7 @@
        // 查询物模型值
        ThingsModelValuesOutput deviceThings = deviceMapper.selectDeviceThingsModelValueBySerialNumber(input.getDeviceNumber());
        //物模型值的项——ThingsModelValueItem
        List<ThingsModelValueItem> thingsModelValues = JSONObject.parseArray(deviceThings.getThingsModelValue(), ThingsModelValueItem.class);
        for (int i = 0; i < input.getThingsModelValueRemarkItem().size(); i++) {