From 88bb0da0d373d06518a9d0ebb839f023ca9ccf1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Sun, 29 Dec 2024 17:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B0=B4=E7=94=B5=E5=8F=8C?= =?UTF-8?q?=E5=87=BB=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=9C=BA=E6=9E=84id=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8Cmqtt=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=BF=83=E8=B7=B3?= =?UTF-8?q?=E6=97=B6=E9=97=B490s=E4=BF=AE=E6=94=B9=E4=B8=BA240s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fastbee/common/constant/FastBeeConstant.java | 2 +- .../data/controller/DeviceReportInfoController.java | 1 - .../java/com/fastbee/iot/domain/DeviceReportInfo.java | 9 +++++++++ .../main/resources/mapper/iot/DeviceReportInfoMapper.xml | 6 +++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/fastbee-common/src/main/java/com/fastbee/common/constant/FastBeeConstant.java b/fastbee-common/src/main/java/com/fastbee/common/constant/FastBeeConstant.java index 6c2eade..54fe938 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/constant/FastBeeConstant.java +++ b/fastbee-common/src/main/java/com/fastbee/common/constant/FastBeeConstant.java @@ -27,7 +27,7 @@ public interface FastBeeConstant { String FAST_PHONE = "phone-"; /*MQTT平台判定离线时间 keepAlive*1.5 */ - Long DEVICE_PING_EXPIRED = 90000L; + Long DEVICE_PING_EXPIRED = 240000L; } interface CLIENT{ diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceReportInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceReportInfoController.java index eda3366..f053ee9 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceReportInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceReportInfoController.java @@ -85,7 +85,6 @@ public class DeviceReportInfoController extends BaseController @ApiOperation("统计是设备相关信息") public AjaxResult listCount(DeviceReportInfo deviceReportInfo) { - List list = deviceReportInfoService.selectDeviceReportInfoList(deviceReportInfo); AtomicInteger onLineTotal= new AtomicInteger(); list.forEach(d->{ diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java index 48a0f69..7393d7d 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java @@ -160,6 +160,15 @@ public class DeviceReportInfo extends BaseEntity @ApiModelProperty("设备类型：1.水电双计 2.流量计") private Integer type; + /** 区域号 */ + @Excel(name = "区域号") + @ApiModelProperty("区域号") + private String areaCode; + + /** 所属机构 */ + @Excel(name = "所属机构") + @ApiModelProperty("所属机构") + private Long deptId; //----------------------------------------------------------业务字段----------------------------------------------------------- /** 是否自动审核 */ @TableField(exist = false) diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml index 01a3170..66757fc 100644 --- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml +++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml @@ -33,10 +33,12 @@ + + - select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status, powers_time, type, longitude, latitude,on_line from iot_device_report_info + select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status, powers_time, type, longitude, latitude,on_line,area_code,dept_id from iot_device_report_info