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

Merge branch 'master' of codeup.aliyun.com:6428039c708c83a3fd907211/hzwmiot/hzwmiot24_java

Browse Source
This commit is contained in:
wyw
2024-08-15 16:06:57 +08:00
parent 6de0dd6a2b 498f77bc80
commit 5f40c70a81
9 changed files with 180 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,6 +178,12 @@ public class Device extends BaseEntity
@ApiModelProperty("设备参数")
private String devParams;
@ApiModelProperty("管护人")
private String caretaker;
@ApiModelProperty("管护单位")
private String managementUnit;
@ApiModelProperty("联系电话")
private String tel;
/**
* 关联组态,来源产品

7
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceAllShortOutput.java
View File

@ -1,6 +1,7 @@
package com.fastbee.iot.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
@ -66,6 +67,12 @@ public class DeviceAllShortOutput
private Integer isOwner;
private Integer subDeviceCount;
@ApiModelProperty("管护人")
private String caretaker;
@ApiModelProperty("管护单位")
private String managementUnit;
@ApiModelProperty("联系电话")
private String tel;
public Integer getSubDeviceCount() {
return subDeviceCount;

7
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceShortOutput.java
View File

@ -94,6 +94,13 @@ public class DeviceShortOutput
@Excel(name = "网关设备编号(子设备使用)")
private String gwDevCode;
@ApiModelProperty("管护人")
private String caretaker;
@ApiModelProperty("管护单位")
private String managementUnit;
@ApiModelProperty("联系电话")
private String tel;
/** 是否自定义位置 **/
private Integer locationWay;

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

@ -1635,6 +1635,7 @@ public class DeviceServiceImpl implements IDeviceService {
kvHashMap.put("beginTime", beginTime);
kvHashMap.put("endTime", endTime);
List<ThingsModel> thingsModels = thingsModelService.selectThingsModelList(new ThingsModel(device.getProductId()));
thingsModels.sort(Comparator.comparing(ThingsModel::getModelOrder));
List<DeviceLog> deviceLogs= logService.selectDataList(kvHashMap);
Map<String, List<DeviceLog>> collect = deviceLogs != null ? deviceLogs.stream().collect(Collectors.groupingBy(t -> t.getIdentity())): new HashMap();
for (ThingsModel modelDevice : thingsModels) {