qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:太阳能网控，后台代码修改完善。

Browse Source
This commit is contained in:
tianyongbao
2026-04-25 06:49:58 +08:00
parent 44b2844f19
commit cf08bbd2cb
8 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intc-modules/intc-iot/src/main/java/com/intc/iot/controller/IotController.java
View File

@@ -1704,15 +1704,18 @@ public class IotController extends BaseController {
// 初始化警告码
int warnCode = 0;
// 判断是否离线
boolean isOffline = status != null && "OFFLINE".equalsIgnoreCase(status);
// 如果设备离线，添加离线警告
if (status != null && "OFFLINE".equalsIgnoreCase(status)) {
if (isOffline) {
warnCode |= 0x0080; // 设备离线
}
device.setWarnCode(warnCode);
// 验证 ICCID 是否存在
if (device.getIccId() == null || device.getIccId().isEmpty()) {
// 验证 ICCID 是否存在：设备离线时属性无法读取，允许跳过，上线后会通过数据上报补全
if (!isOffline && (device.getIccId() == null || device.getIccId().isEmpty())) {
return R.fail("设备缺少物联网卡号(ICCID)");
}

7
intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java
View File

@@ -2215,8 +2215,8 @@ public class DeviceDataHandler {
: params.getDouble("phasedifference");
sensorData.setPhaseDifference(value);
}
if (params.containsKey("battery")) {
sensorData.setBattery(params.getDouble("battery"));
if (params.containsKey("ChargeFlag")) {
sensorData.setBattery(params.getDouble("ChargeFlag"));
}
// TODO: 如果需要设置 deviceId、userId 等标签字段，需要从设备管理系统查询
@@ -2271,6 +2271,9 @@ public class DeviceDataHandler {
if (sensorData.getSalinity() != null) {
updateDevice.setValueSalinity(sensorData.getSalinity());
}
if (sensorData.getBattery() != null) {
updateDevice.setValueBattery(sensorData.getBattery().intValue());
}
int updated = deviceMapper.updateById(updateDevice);
if (updated > 0) {
log.debug("设备实时数据已更新: {}", deviceName);