luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备基础信息中增加设备详细数据

Browse Source
This commit is contained in:
wuyw
2024-08-18 23:30:15 +08:00
parent d37ea25372
commit 0386d7d270
9 changed files with 145 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/Device.java
View File

@ -1,5 +1,6 @@
package com.fastbee.iot.domain;
import com.fastbee.common.model.vo.iot.DeviceDetailVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fastbee.common.annotation.Excel;
import com.fastbee.common.core.domain.BaseEntity;
@ -165,7 +166,9 @@ public class Device extends BaseEntity
@Transient
@ApiModelProperty("机构id")
private Long deptId;
//设备详情
@ApiModelProperty("详情")
private DeviceDetailVo deviceDetailVo;
@Transient
@ApiModelProperty("是否显示下级")
private Boolean showChild;

3
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IDeviceService.java
View File

@ -4,6 +4,7 @@ import com.fastbee.common.core.device.DeviceAndProtocol;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem;
import com.fastbee.common.enums.DeviceStatus;
import com.fastbee.common.model.vo.iot.DeviceDetailVo;
import com.fastbee.iot.domain.Device;
import com.fastbee.iot.domain.DeviceGroup;
import com.fastbee.iot.domain.JiankongDeviceParam;
@ -336,4 +337,6 @@ public interface IDeviceService
ArrayList<Object> getDeviceLogAllCurves(Long deviceId, String beginTime, String endTime);
Map<String, Object> getvideourl(JiankongDeviceParam jiankongDeviceParam);
}

10
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.fastbee.common.constant.Constants;
import com.fastbee.common.constant.ProductAuthConstant;
import com.fastbee.common.core.device.DeviceAndProtocol;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.CommonResult;
import com.fastbee.common.core.domain.entity.SysDept;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.model.LoginUser;
@ -17,6 +18,7 @@ import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem;
import com.fastbee.common.core.thingsModel.ThingsModelValuesInput;
import com.fastbee.common.enums.*;
import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.model.vo.iot.DeviceDetailVo;
import com.fastbee.common.utils.*;
import com.fastbee.common.utils.http.HttpUtils;
import com.fastbee.common.utils.ip.IpUtils;
@ -24,6 +26,7 @@ import com.fastbee.common.utils.json.JsonUtils;
import com.fastbee.iot.cache.ITSLCache;
import com.fastbee.iot.domain.*;
import com.fastbee.iot.haikang.HaikangYingshiApi;
import com.fastbee.iot.haiwei.service.HaiWeiService;
import com.fastbee.iot.mapper.*;
import com.fastbee.iot.model.*;
import com.fastbee.iot.model.ThingsModelItem.Datatype;
@ -32,6 +35,8 @@ import com.fastbee.iot.domain.ThingsModel;
import com.fastbee.iot.model.ThingsModels.*;
import com.fastbee.iot.model.dto.ThingsModelDTO;
import com.fastbee.iot.model.gateWay.SubDeviceListVO;
import com.fastbee.iot.model.haiwei.HaiWeiDeviceInfoVo;
import com.fastbee.iot.model.haiwei.HaiWeiPropertyVo;
import com.fastbee.iot.service.*;
import com.fastbee.iot.cache.IDeviceCache;
import com.fastbee.iot.cache.ITSLValueCache;
@ -40,6 +45,7 @@ import com.fastbee.system.mapper.SysDeptMapper;
import com.fastbee.system.service.ISysUserService;
import com.fastbee.waterele.domain.MaWatereleRecord;
import com.fastbee.waterele.service.IMaWatereleRecordService;
import com.fastbee.waterele.service.impl.MaWatereleRecordServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@ -124,9 +130,6 @@ public class DeviceServiceImpl implements IDeviceService {
private SubGatewayMapper subGatewayMapper;
@Resource
private IOrderControlService orderControlService;
@Resource
private IMaWatereleRecordService watereleRecordService;
/**
* 查询设备
*
@ -1755,4 +1758,5 @@ public class DeviceServiceImpl implements IDeviceService {
}

8
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/QxtrTask.java
View File

@ -122,8 +122,9 @@ public class QxtrTask {
com.alibaba.fastjson2.JSONObject thingsModelObject =
com.alibaba.fastjson2.JSONObject.parseObject(itslCache.getCacheThingsModelByProductId(productId));
com.alibaba.fastjson2.JSONArray thingsList = thingsModelObject.getJSONArray("properties");
List<PropertyDto> properties = thingsList.toList(PropertyDto.class);
Map<String, List<PropertyDto>> stringListMap = properties.stream().collect(Collectors.groupingBy(PropertyDto::getGroup));
List<PropertyDto> properties = thingsList.toList(PropertyDto.class);
Map<String, List<PropertyDto>> stringListMap =
properties.stream().collect(Collectors.groupingBy(PropertyDto::getGroup));
for (Device device : devices) {
try {
Map<String, String> devParams = getDevParams(device);
@ -141,7 +142,8 @@ public class QxtrTask {
tags[i] = propertyDtos.get(i).getId();
}
haiWeiBo.setTags(tags);
HttpResultDTO duhttpResultDTO = HttpAPIController.doPostWithJsonParamAndHeaders(url, JsonUtils.toJsonString(haiWeiBo),
HttpResultDTO duhttpResultDTO =
HttpAPIController.doPostWithJsonParamAndHeaders(url, JsonUtils.toJsonString(haiWeiBo),
new HashMap<>());
if (null != duhttpResultDTO && duhttpResultDTO.getCode() == 200) {
Object object = com.alibaba.fastjson.JSON.parse(duhttpResultDTO.getBody()); //先转换成Object