新增水电双击设备信息区域号，机构id字段，mqtt客户端心跳时间90s修改为240s

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{

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<DeviceReportInfo> list = deviceReportInfoService.selectDeviceReportInfoList(deviceReportInfo);
             AtomicInteger onLineTotal= new AtomicInteger();
             list.forEach(d->{

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)

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

@@ -33,10 +33,12 @@
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
         <result property="onLine"    column="on_line"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="deptId"    column="dept_id"    />
     </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 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
     </sql>
 
     <select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@@ -69,6 +71,8 @@
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
             <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>
         </where>
     </select>