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 9217efc155
commit 03c8bfb276
8 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/DeviceController.java
View File

@@ -317,6 +317,10 @@ public class DeviceController extends BaseController {
data.setSalinityCompensation(device.getSalinityCompensation());
data.setInputVoltage(device.getInputVoltage());
data.setVoltageWarnOpen(device.getVoltageWarnOpen());
data.setBatteryWarnCallOpen(device.getBatteryWarnCallOpen());
data.setBatteryWarnCallNoDis(device.getBatteryWarnCallNoDis());
data.setBatteryWarnLower(device.getBatteryWarnLower());
// 设置塘口信息
if (device.getPondId() != null && device.getPondId() > 0) {

7
intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java
View File

@@ -186,7 +186,7 @@ public class PondController extends BaseController {
/**
* 根据塘口ID查询设备列表
* 返回数据按设备类型分类：
* - listDetector: 水质检测仪列表（deviceType=1）+ 开启溶氧检测的测控一体机（deviceType=2 && isOxygenUsed=1）
* - listDetector: 水质检测仪列表（deviceType=1）+ 开启溢氧检测的测控一体机（deviceType=2 && isOxygenUsed=1）+ 太阳能网控（deviceType=3）
* - listController: 测控一体机列表（deviceType=2），包含开关列表
*
* @param pondId 塘口ID
@@ -294,10 +294,11 @@ public class PondController extends BaseController {
// 9. 处理探测器列表（严格从 pondDevices 取，与 C# pond.ListDevice 保持一致，不包含仅开关挂塘口的设备）
List<DeviceVo> detectorList = new ArrayList<>();
for (Device device : pondDevices) {
// 水质检测仪 或 开启溶氧检测的测控一体机
// 水质检测仪 或 开启溢氧检测的测控一体机 或 太阳能网控
if ((device.getDeviceType() != null && device.getDeviceType() == 1)
|| (device.getDeviceType() != null && device.getDeviceType() == 2
&& device.getIsOxygenUsed() != null && device.getIsOxygenUsed() == 1)) {
&& device.getIsOxygenUsed() != null && device.getIsOxygenUsed() == 1)
|| (device.getDeviceType() != null && device.getDeviceType() == 3)) {
DeviceVo deviceVo = MapstructUtils.convert(device, DeviceVo.class);

5
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/Device.java
View File

@@ -238,5 +238,10 @@ public class Device extends TenantEntity {
*/
private Long batteryWarnLower;
/**
* 电量值（太阳能网控专用，0-100）
*/
private Integer valueBattery;
}

6
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java
View File

@@ -306,6 +306,12 @@ public class DeviceVo implements Serializable {
@ExcelProperty(value = "电量电话告警下限")
private Long batteryWarnLower;
/**
* 电量值（太阳能网控专用，0-100）
*/
@ExcelProperty(value = "电量值")
private Integer valueBattery;
/**
* 手机号
*/

15
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/PublicDeviceBaseData.java
View File

@@ -109,6 +109,21 @@ public class PublicDeviceBaseData implements Serializable {
*/
private Integer voltageWarnOpen;
/**
* 低电量电话告警开关（太阳能网控专用）
*/
private Long batteryWarnCallOpen;
/**
* 低电量告警免打扰（太阳能网控专用）
*/
private Long batteryWarnCallNoDis;
/**
* 低电量告警下限（太阳能网控专用，0-100）
*/
private Long batteryWarnLower;
/**
* 开关列表（仅测控一体机）
*/