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:
mi9688
2024-12-06 17:34:01 +08:00
parent 6aaed01915
commit 71f4f3b139
15 changed files with 260 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
View File

@ -58,12 +58,12 @@ private static final long serialVersionUID = 1L;
/** MCU固件，包含了固件的名称和版本 */
@Excel(name = "MCU固件，包含了固件的名称和版本")
@ApiModelProperty("MCU固件，包含了固件的名称和版本")
private String mcufw;
private String mcuFw;
/** 模组固件，包含了固件的名称和版本 */
@Excel(name = "模组固件，包含了固件的名称和版本")
@ApiModelProperty("模组固件，包含了固件的名称和版本")
private String ltefw;
private String lteFw;
/** 显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116 */
@Excel(name = "显示屏厂家，上报1，2，3等类似的数值，通过后台进行录入数值和显示屏厂家对应关系例：1对应GT2116")
@ -90,4 +90,9 @@ private static final long serialVersionUID = 1L;
@ApiModelProperty("记录测试的过程，包括了测试脉冲次数、第一次上电时间等待补充信息")
private String testRecord;
/** 批号 */
@Excel(name = "批号")
@ApiModelProperty("批号")
private Long batchNumber;
}

6
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/DeviceDateTask.java
View File

@ -154,7 +154,6 @@ public class DeviceDateTask {
catch (Exception e){
offlineDeviceList.add(deviceEncoding);
}
DeviceRealtimedataMeteorology deviceRealtimedataMeteorology = metDataService.setData(deviceRealTimeData);
boolean save = meteorologySaveDataService.save(deviceRealtimedataMeteorology);
if (!save){
@ -172,8 +171,6 @@ public class DeviceDateTask {
new LambdaUpdateChainWrapper<>(meteorologyMapper).in(DeviceInformationMeteorology::getDeviceEncoding,offlineDeviceList).set(DeviceInformationMeteorology::getStatus, 0).update();
}
}
}
/**
* 获取墒情设备实时数据并保存
@ -186,7 +183,6 @@ public class DeviceDateTask {
//在线设备列表
List<String> onlineDeviceList = new ArrayList<>();
try{
deviceEncodingList.forEach(deviceEncoding->{
Map<String, String> deviceRealTimeData = new HashMap<>();
try {
@ -206,7 +202,7 @@ public class DeviceDateTask {
}
}
catch (Exception e){
log.error("获取墒情设备实时数据失败",e);
log.error("获取墒情设备实时数据失败:{}",e.getMessage());
if(!offlineDeviceList.isEmpty()){
new LambdaUpdateChainWrapper<>(moistureMapper).in(DeviceInformationMoisture::getDeviceEncoding,offlineDeviceList).set(DeviceInformationMoisture::getStatus, 0).update();
}