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

mqtt消息添加心跳包处理，设备新增运行状态字段以及接口

Browse Source
This commit is contained in:
蒾酒
2024-12-30 22:46:51 +08:00
parent c783cfb492
commit 672eff2c55
5 changed files with 91 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,11 @@ public class DeviceReportInfo extends BaseEntity
@Excel(name = "所属机构")
@ApiModelProperty("所属机构")
private Long deptId;
/** yun'xing */
@Excel(name = "yun'xing")
@ApiModelProperty("yun'xing")
private Long runStatus;
//----------------------------------------------------------业务字段-----------------------------------------------------------
/** 是否自动审核 */
@TableField(exist = false)

4
fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
View File

@ -35,10 +35,11 @@
<result property="onLine" column="on_line" />
<result property="areaCode" column="area_code" />
<result property="deptId" column="dept_id" />
<result property="runStatus" column="run_status" />
</resultMap>
<sql id="selectDeviceReportInfoVo">
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
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,run_status from iot_device_report_info
</sql>
<select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@ -73,6 +74,7 @@
<if test="onLine != null "> and on_line = #{onLine}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="runStatus != null "> and run_status = #{runStatus}</if>
</where>
<!-- 添加排序 -->
order by powers_time desc